From 6837e135364d18a627cf85c3bc51aeb7f7749cb8 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Thu, 12 May 2011 15:23:06 -0400 Subject: [PATCH] Made logging format more compact and less ambiguous. original commit: 33962befd4fe704f4e15caa4b157187c10cf9944 --- .../close-calls/real-in-float-expr.rkt | 2 +- .../typed-scheme/optimizer/tests/add1.rkt | 8 +- .../optimizer/tests/apply-plus.rkt | 4 +- .../optimizer/tests/begin-float.rkt | 4 +- .../optimizer/tests/binary-fixnum.rkt | 4 +- .../optimizer/tests/binary-nonzero-fixnum.rkt | 4 +- .../typed-scheme/optimizer/tests/box.rkt | 6 +- .../optimizer/tests/cross-module-struct2.rkt | 2 +- .../optimizer/tests/dead-else.rkt | 8 +- .../optimizer/tests/dead-then.rkt | 8 +- .../optimizer/tests/define-begin-float.rkt | 4 +- .../optimizer/tests/define-call-float.rkt | 2 +- .../optimizer/tests/define-float.rkt | 2 +- .../optimizer/tests/define-pair.rkt | 2 +- .../optimizer/tests/derived-pair.rkt | 28 ++- .../optimizer/tests/derived-pair2.rkt | 64 +++---- .../optimizer/tests/derived-pair3.rkt | 160 +++++++++--------- .../optimizer/tests/double-float.rkt | 2 +- .../optimizer/tests/exact-inexact.rkt | 2 +- .../optimizer/tests/fixnum-bounded-expr.rkt | 52 +++--- .../optimizer/tests/fixnum-comparison.rkt | 6 +- .../optimizer/tests/float-comp.rkt | 2 +- .../tests/float-complex-conjugate-top.rkt | 10 +- .../tests/float-complex-conjugate.rkt | 12 +- .../optimizer/tests/float-complex-div.rkt | 10 +- .../optimizer/tests/float-complex-fixnum.rkt | 16 +- .../tests/float-complex-float-div.rkt | 74 ++++---- .../tests/float-complex-float-mul.rkt | 56 +++--- .../tests/float-complex-float-small.rkt | 46 ++--- .../optimizer/tests/float-complex-float.rkt | 40 ++--- .../optimizer/tests/float-complex-i.rkt | 12 +- .../optimizer/tests/float-complex-integer.rkt | 8 +- .../optimizer/tests/float-complex-mult.rkt | 10 +- .../optimizer/tests/float-complex-parts.rkt | 12 +- .../optimizer/tests/float-complex-parts2.rkt | 64 +++---- .../optimizer/tests/float-complex-parts3.rkt | 56 +++--- .../optimizer/tests/float-complex-sin.rkt | 8 +- .../optimizer/tests/float-complex.rkt | 16 +- .../optimizer/tests/float-fun.rkt | 2 +- .../optimizer/tests/float-promotion.rkt | 8 +- .../optimizer/tests/flvector-length.rkt | 2 +- .../typed-scheme/optimizer/tests/fx-fl.rkt | 2 +- .../typed-scheme/optimizer/tests/in-bytes.rkt | 2 +- .../typed-scheme/optimizer/tests/in-list.rkt | 2 +- .../optimizer/tests/in-string.rkt | 2 +- .../optimizer/tests/in-vector.rkt | 2 +- .../optimizer/tests/invalid-exact-inexact.rkt | 2 +- .../optimizer/tests/invalid-unboxed-let.rkt | 48 +++--- .../optimizer/tests/invalid-unboxed-let2.rkt | 24 +-- .../optimizer/tests/known-vector-length.rkt | 4 +- .../optimizer/tests/let-float.rkt | 4 +- .../typed-scheme/optimizer/tests/let-rhs.rkt | 2 +- .../optimizer/tests/literal-int.rkt | 2 +- .../optimizer/tests/magnitude.rkt | 6 +- .../optimizer/tests/make-flrectangular.rkt | 4 +- .../optimizer/tests/make-polar.rkt | 30 ++-- .../optimizer/tests/maybe-exact-complex.rkt | 8 +- .../typed-scheme/optimizer/tests/mpair.rkt | 14 +- .../optimizer/tests/n-ary-float-complex.rkt | 12 +- .../optimizer/tests/n-ary-float.rkt | 2 +- .../optimizer/tests/nested-float-complex.rkt | 12 +- .../optimizer/tests/nested-float.rkt | 4 +- .../optimizer/tests/nested-float2.rkt | 4 +- .../optimizer/tests/nested-let-loop.rkt | 72 ++++---- .../optimizer/tests/nested-pair1.rkt | 4 +- .../optimizer/tests/nested-pair2.rkt | 4 +- .../optimizer/tests/nested-unboxed-let.rkt | 40 ++--- .../optimizer/tests/one-arg-arith.rkt | 30 ++-- .../typed-scheme/optimizer/tests/pair-fun.rkt | 2 +- .../tests/pair-known-length-list.rkt | 24 +-- .../optimizer/tests/rational-literal.rkt | 2 +- .../optimizer/tests/real-part-loop.rkt | 36 ++-- .../optimizer/tests/silent-dead-branch.rkt | 2 +- .../optimizer/tests/simple-float.rkt | 2 +- .../optimizer/tests/simple-pair.rkt | 2 +- .../optimizer/tests/sqrt-segfault.rkt | 4 +- .../typed-scheme/optimizer/tests/sqrt.rkt | 2 +- .../optimizer/tests/string-length.rkt | 4 +- .../typed-scheme/optimizer/tests/structs.rkt | 4 +- .../optimizer/tests/unary-fixnum-nested.rkt | 4 +- .../optimizer/tests/unary-fixnum.rkt | 2 +- .../optimizer/tests/unary-float.rkt | 2 +- .../optimizer/tests/unboxed-for.rkt | 80 ++++----- .../tests/unboxed-let-functions1.rkt | 32 ++-- .../tests/unboxed-let-functions2.rkt | 44 ++--- .../tests/unboxed-let-functions3.rkt | 32 ++-- .../tests/unboxed-let-functions4.rkt | 32 ++-- .../tests/unboxed-let-functions5.rkt | 8 +- .../tests/unboxed-let-functions6.rkt | 42 ++--- .../tests/unboxed-let-functions7.rkt | 38 ++--- .../tests/unboxed-let-functions8.rkt | 8 +- .../optimizer/tests/unboxed-let.rkt | 52 +++--- .../optimizer/tests/unboxed-let2.rkt | 38 ++--- .../optimizer/tests/unboxed-let3.rkt | 26 +-- .../tests/unboxed-letrec-syntaxes+values.rkt | 24 +-- .../optimizer/tests/unboxed-letrec.rkt | 34 ++-- .../tests/unboxed-make-rectangular.rkt | 40 ++--- .../optimizer/tests/vector-length-nested.rkt | 4 +- .../optimizer/tests/vector-length.rkt | 2 +- .../optimizer/tests/vector-ref-set-ref.rkt | 6 +- .../optimizer/tests/vector-ref.rkt | 2 +- .../optimizer/tests/vector-ref2.rkt | 2 +- .../optimizer/tests/vector-set-quote.rkt | 2 +- .../optimizer/tests/vector-set.rkt | 2 +- .../optimizer/tests/vector-set2.rkt | 2 +- .../typed-scheme/optimizer/tests/zero.rkt | 6 +- collects/typed-scheme/optimizer/utils.rkt | 16 +- 107 files changed, 924 insertions(+), 922 deletions(-) diff --git a/collects/tests/typed-scheme/optimizer/close-calls/real-in-float-expr.rkt b/collects/tests/typed-scheme/optimizer/close-calls/real-in-float-expr.rkt index b97b60f4..0d826c18 100644 --- a/collects/tests/typed-scheme/optimizer/close-calls/real-in-float-expr.rkt +++ b/collects/tests/typed-scheme/optimizer/close-calls/real-in-float-expr.rkt @@ -1,6 +1,6 @@ #; ( - real-in-float-expr.rkt line 10 col 0 - (#%app * (quote 3) (quote 2.3)) - binary, args all float-arg-expr, return type not Float + real-in-float-expr.rkt 10:0 (#%app * (quote 3) (quote 2.3)) -- binary, args all float-arg-expr, return type not Float 6.8999999999999995 6 5 diff --git a/collects/tests/typed-scheme/optimizer/tests/add1.rkt b/collects/tests/typed-scheme/optimizer/tests/add1.rkt index 49e97d40..9b40c03b 100644 --- a/collects/tests/typed-scheme/optimizer/tests/add1.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/add1.rkt @@ -1,9 +1,9 @@ #; ( -add1.rkt line 14 col 6 - add1 - fixnum add1 -add1.rkt line 15 col 6 - sub1 - fixnum sub1 -add1.rkt line 16 col 6 - add1 - float add1 -add1.rkt line 17 col 6 - sub1 - float sub1 +add1.rkt 14:6 add1 -- fixnum add1 +add1.rkt 15:6 sub1 -- fixnum sub1 +add1.rkt 16:6 add1 -- float add1 +add1.rkt 17:6 sub1 -- float sub1 6 2 3.3 diff --git a/collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt b/collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt index d3f4b79d..0082d6a1 100644 --- a/collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt @@ -1,7 +1,7 @@ #; ( -apply-plus.rkt line 12 col 7 - + - apply-map -apply-plus.rkt line 13 col 7 - * - apply-map +apply-plus.rkt 12:7 + -- apply-map +apply-plus.rkt 13:7 * -- apply-map 9 24 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/begin-float.rkt b/collects/tests/typed-scheme/optimizer/tests/begin-float.rkt index 1514e0b0..4eb2485c 100644 --- a/collects/tests/typed-scheme/optimizer/tests/begin-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/begin-float.rkt @@ -1,7 +1,7 @@ #; ( -begin-float.rkt line 12 col 8 - - - binary float -begin-float.rkt line 13 col 8 - * - binary float +begin-float.rkt 12:8 - -- binary float +begin-float.rkt 13:8 * -- binary float -1.0 6.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt index 0b6ab3e0..47663ea8 100644 --- a/collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt @@ -1,7 +1,7 @@ #; ( -binary-fixnum.rkt line 12 col 16 - vector-length - vector-length -binary-fixnum.rkt line 12 col 3 - bitwise-and - binary fixnum +binary-fixnum.rkt 12:16 vector-length -- vector-length +binary-fixnum.rkt 12:3 bitwise-and -- binary fixnum ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt index ed3f7ed4..ca3f775d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt @@ -1,7 +1,7 @@ #; ( -binary-nonzero-fixnum.rkt line 11 col 9 - vector-length - vector-length -binary-nonzero-fixnum.rkt line 11 col 1 - modulo - binary nonzero fixnum +binary-nonzero-fixnum.rkt 11:9 vector-length -- vector-length +binary-nonzero-fixnum.rkt 11:1 modulo -- binary nonzero fixnum 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/box.rkt b/collects/tests/typed-scheme/optimizer/tests/box.rkt index 9ea6b1df..57415e0e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/box.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/box.rkt @@ -1,8 +1,8 @@ #; ( -box.rkt line 17 col 1 - unbox - box -box.rkt line 18 col 1 - set-box! - box -box.rkt line 19 col 1 - unbox - box +box.rkt 17:1 unbox -- box +box.rkt 18:1 set-box! -- box +box.rkt 19:1 unbox -- box 1 2 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt b/collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt index e310b047..2f7b5e91 100644 --- a/collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt @@ -1,6 +1,6 @@ #; ( -cross-module-struct2.rkt line 11 col 1 - x-x - struct ref +cross-module-struct2.rkt 11:1 x-x -- struct ref 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/dead-else.rkt b/collects/tests/typed-scheme/optimizer/tests/dead-else.rkt index 82160d76..1efdba37 100644 --- a/collects/tests/typed-scheme/optimizer/tests/dead-else.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/dead-else.rkt @@ -1,9 +1,9 @@ #; ( -dead-else.rkt line 15 col 13 - (#%app + (quote 4.0) (quote 5.0)) - dead else branch -dead-else.rkt line 14 col 14 - + - binary float -dead-else.rkt line 18 col 13 - (#%app + (quote 4.0) (quote 5.0)) - dead else branch -dead-else.rkt line 17 col 14 - + - binary float +dead-else.rkt 15:13 (#%app + (quote 4.0) (quote 5.0)) -- dead else branch +dead-else.rkt 14:14 + -- binary float +dead-else.rkt 18:13 (#%app + (quote 4.0) (quote 5.0)) -- dead else branch +dead-else.rkt 17:14 + -- binary float 5.05.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/dead-then.rkt b/collects/tests/typed-scheme/optimizer/tests/dead-then.rkt index 0a727c37..ef575971 100644 --- a/collects/tests/typed-scheme/optimizer/tests/dead-then.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/dead-then.rkt @@ -1,9 +1,9 @@ #; ( -dead-then.rkt line 14 col 13 - (#%app + (quote 2.0) (quote 3.0)) - dead then branch -dead-then.rkt line 15 col 14 - + - binary float -dead-then.rkt line 17 col 13 - (#%app + (quote 2.0) (quote 3.0)) - dead then branch -dead-then.rkt line 18 col 14 - + - binary float +dead-then.rkt 14:13 (#%app + (quote 2.0) (quote 3.0)) -- dead then branch +dead-then.rkt 15:14 + -- binary float +dead-then.rkt 17:13 (#%app + (quote 2.0) (quote 3.0)) -- dead then branch +dead-then.rkt 18:14 + -- binary float 9.09.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt index e7e3641e..391e329d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt @@ -1,7 +1,7 @@ #; ( -define-begin-float.rkt line 11 col 27 - - - binary float -define-begin-float.rkt line 12 col 18 - * - binary float +define-begin-float.rkt 11:27 - -- binary float +define-begin-float.rkt 12:18 * -- binary float -1.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt index 479a47f2..57a9d250 100644 --- a/collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt @@ -1,6 +1,6 @@ #; ( -define-call-float.rkt line 9 col 17 - + - binary float +define-call-float.rkt 9:17 + -- binary float ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/define-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-float.rkt index 853afc03..8c8ec582 100644 --- a/collects/tests/typed-scheme/optimizer/tests/define-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/define-float.rkt @@ -1,6 +1,6 @@ #; ( -define-float.rkt line 9 col 11 - + - binary float +define-float.rkt 9:11 + -- binary float ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/define-pair.rkt b/collects/tests/typed-scheme/optimizer/tests/define-pair.rkt index 006029b3..655d3b4b 100644 --- a/collects/tests/typed-scheme/optimizer/tests/define-pair.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/define-pair.rkt @@ -1,6 +1,6 @@ #; ( -define-pair.rkt line 9 col 11 - car - pair +define-pair.rkt 9:11 car -- pair ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/derived-pair.rkt b/collects/tests/typed-scheme/optimizer/tests/derived-pair.rkt index 575cc1c9..cb8f1816 100644 --- a/collects/tests/typed-scheme/optimizer/tests/derived-pair.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/derived-pair.rkt @@ -1,21 +1,17 @@ #; ( -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair.rkt line 27 col 0 - (#%app caar (#%app cons (#%app cons (quote 1) (quote 2) -) (quote 3))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair.rkt line 28 col 0 - (#%app cadr (#%app cons (quote 1) (#%app cons (quote 2) - (quote 3)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair.rkt line 29 col 0 - (#%app cdar (#%app cons (#%app cons (quote 1) (quote 2) -) (quote 3))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair.rkt line 30 col 0 - (#%app cddr (#%app cons (quote 1) (#%app cons (quote 2) - (quote 3)))) - derived pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair.rkt 23:0 (#%app caar (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair.rkt 24:0 (#%app cadr (#%app cons (quote 1) (#%app cons (quote 2) (quote 3)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair.rkt 25:0 (#%app cdar (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair.rkt 26:0 (#%app cddr (#%app cons (quote 1) (#%app cons (quote 2) (quote 3)))) -- derived pair 1 2 2 diff --git a/collects/tests/typed-scheme/optimizer/tests/derived-pair2.rkt b/collects/tests/typed-scheme/optimizer/tests/derived-pair2.rkt index 2f540a2a..e146235d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/derived-pair2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/derived-pair2.rkt @@ -1,37 +1,37 @@ #; ( -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair2.rkt line 47 col 0 - (#%app caaar (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair2.rkt line 48 col 0 - (#%app caadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair2.rkt line 49 col 0 - (#%app cadar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair2.rkt line 50 col 0 - (#%app caddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair2.rkt line 51 col 0 - (#%app cdaar (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair2.rkt line 52 col 0 - (#%app cdadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair2.rkt line 53 col 0 - (#%app cddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair2.rkt line 54 col 0 - (#%app cdddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))))) - derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair2.rkt 47:0 (#%app caaar (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair2.rkt 48:0 (#%app caadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair2.rkt 49:0 (#%app cadar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair2.rkt 50:0 (#%app caddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))))) -- derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair2.rkt 51:0 (#%app cdaar (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair2.rkt 52:0 (#%app cdadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair2.rkt 53:0 (#%app cddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair2.rkt 54:0 (#%app cdddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))))) -- derived pair 1 2 2 diff --git a/collects/tests/typed-scheme/optimizer/tests/derived-pair3.rkt b/collects/tests/typed-scheme/optimizer/tests/derived-pair3.rkt index 4fa58e4d..2451497a 100644 --- a/collects/tests/typed-scheme/optimizer/tests/derived-pair3.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/derived-pair3.rkt @@ -1,85 +1,85 @@ #; ( -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 103 col 0 - (#%app caaaar (#%app cons (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4)) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 104 col 0 - (#%app caaadr (#%app cons (quote 1) (#%app cons (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)) (quote 5)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 105 col 0 - (#%app caadar (#%app cons (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4))) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 106 col 0 - (#%app caaddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (#%app cons (quote 3) (quote 4)) (quote 5))))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 107 col 0 - (#%app cadaar (#%app cons (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4)) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 108 col 0 - (#%app cadadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))) (quote 5)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 109 col 0 - (#%app caddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4)))) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -derived-pair3.rkt line 110 col 0 - (#%app cadddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (#%app cons (quote 4) (quote 5)))))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 111 col 0 - (#%app cdaaar (#%app cons (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4)) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 112 col 0 - (#%app cdaadr (#%app cons (quote 1) (#%app cons (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)) (quote 5)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 113 col 0 - (#%app cdadar (#%app cons (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4))) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 114 col 0 - (#%app cdaddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (#%app cons (quote 3) (quote 4)) (quote 5))))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 115 col 0 - (#%app cddaar (#%app cons (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4)) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 116 col 0 - (#%app cddadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))) (quote 5)))) - derived pair -#f line #f col #f - car - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 117 col 0 - (#%app cdddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4)))) (quote 5))) - derived pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -#f line #f col #f - cdr - pair -derived-pair3.rkt line 118 col 0 - (#%app cddddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (#%app cons (quote 4) (quote 5)))))) - derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair3.rkt 103:0 (#%app caaaar (#%app cons (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4)) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair3.rkt 104:0 (#%app caaadr (#%app cons (quote 1) (#%app cons (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)) (quote 5)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair3.rkt 105:0 (#%app caadar (#%app cons (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4))) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) car -- pair +derived-pair3.rkt 106:0 (#%app caaddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (#%app cons (quote 3) (quote 4)) (quote 5))))) -- derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair3.rkt 107:0 (#%app cadaar (#%app cons (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4)) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair3.rkt 108:0 (#%app cadadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))) (quote 5)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair3.rkt 109:0 (#%app caddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4)))) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +derived-pair3.rkt 110:0 (#%app cadddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (#%app cons (quote 4) (quote 5)))))) -- derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 111:0 (#%app cdaaar (#%app cons (#%app cons (#%app cons (#%app cons (quote 1) (quote 2)) (quote 3)) (quote 4)) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 112:0 (#%app cdaadr (#%app cons (quote 1) (#%app cons (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4)) (quote 5)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 113:0 (#%app cdadar (#%app cons (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (quote 3)) (quote 4))) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 114:0 (#%app cdaddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (#%app cons (quote 3) (quote 4)) (quote 5))))) -- derived pair +#f (no location) car -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 115:0 (#%app cddaar (#%app cons (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (quote 3))) (quote 4)) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 116:0 (#%app cddadr (#%app cons (quote 1) (#%app cons (#%app cons (quote 2) (#%app cons (quote 3) (quote 4))) (quote 5)))) -- derived pair +#f (no location) car -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 117:0 (#%app cdddar (#%app cons (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (quote 4)))) (quote 5))) -- derived pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +#f (no location) cdr -- pair +derived-pair3.rkt 118:0 (#%app cddddr (#%app cons (quote 1) (#%app cons (quote 2) (#%app cons (quote 3) (#%app cons (quote 4) (quote 5)))))) -- derived pair 1 2 2 diff --git a/collects/tests/typed-scheme/optimizer/tests/double-float.rkt b/collects/tests/typed-scheme/optimizer/tests/double-float.rkt index 951ced61..4db0ee04 100644 --- a/collects/tests/typed-scheme/optimizer/tests/double-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/double-float.rkt @@ -1,6 +1,6 @@ #; ( -double-float.rkt line 10 col 1 - + - binary float +double-float.rkt 10:1 + -- binary float 6.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt index e2efe744..a41e7d03 100644 --- a/collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt @@ -1,6 +1,6 @@ #; ( -exact-inexact.rkt line 10 col 1 - exact->inexact - int to float +exact-inexact.rkt 10:1 exact->inexact -- int to float 1e+100 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/fixnum-bounded-expr.rkt b/collects/tests/typed-scheme/optimizer/tests/fixnum-bounded-expr.rkt index 45971820..ebd24eb8 100644 --- a/collects/tests/typed-scheme/optimizer/tests/fixnum-bounded-expr.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/fixnum-bounded-expr.rkt @@ -1,31 +1,31 @@ #; ( -fixnum-bounded-expr.rkt line 60 col 3 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 66 col 8 - * - fixnum bounded expr -fixnum-bounded-expr.rkt line 66 col 3 - - - fixnum bounded expr -fixnum-bounded-expr.rkt line 73 col 3 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 76 col 3 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 81 col 1 - abs - fixnum fxabs -fixnum-bounded-expr.rkt line 84 col 1 - fx+ - fixnum fx+ -fixnum-bounded-expr.rkt line 85 col 6 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 85 col 17 - * - fixnum bounded expr -fixnum-bounded-expr.rkt line 85 col 1 - fx+ - fixnum fx+ -fixnum-bounded-expr.rkt line 86 col 9 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 86 col 6 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 86 col 1 - fx+ - fixnum fx+ -fixnum-bounded-expr.rkt line 87 col 12 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 87 col 9 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 87 col 1 - fx+ - fixnum fx+ -fixnum-bounded-expr.rkt line 88 col 6 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 88 col 18 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 88 col 6 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 88 col 18 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 90 col 6 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 90 col 18 - + - fixnum bounded expr -fixnum-bounded-expr.rkt line 90 col 1 - fx- - fixnum fx- -fixnum-bounded-expr.rkt line 93 col 1 - fx* - fixnum fx* -fixnum-bounded-expr.rkt line 96 col 1 - fxquotient - fixnum fxquotient -fixnum-bounded-expr.rkt line 99 col 1 - fxabs - fixnum fxabs +fixnum-bounded-expr.rkt 60:3 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 66:8 * -- fixnum bounded expr +fixnum-bounded-expr.rkt 66:3 - -- fixnum bounded expr +fixnum-bounded-expr.rkt 73:3 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 76:3 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 81:1 abs -- fixnum fxabs +fixnum-bounded-expr.rkt 84:1 fx+ -- fixnum fx+ +fixnum-bounded-expr.rkt 85:6 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 85:17 * -- fixnum bounded expr +fixnum-bounded-expr.rkt 85:1 fx+ -- fixnum fx+ +fixnum-bounded-expr.rkt 86:9 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 86:6 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 86:1 fx+ -- fixnum fx+ +fixnum-bounded-expr.rkt 87:12 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 87:9 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 87:1 fx+ -- fixnum fx+ +fixnum-bounded-expr.rkt 88:6 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 88:18 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 88:6 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 88:18 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 90:6 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 90:18 + -- fixnum bounded expr +fixnum-bounded-expr.rkt 90:1 fx- -- fixnum fx- +fixnum-bounded-expr.rkt 93:1 fx* -- fixnum fx* +fixnum-bounded-expr.rkt 96:1 fxquotient -- fixnum fxquotient +fixnum-bounded-expr.rkt 99:1 fxabs -- fixnum fxabs 28 89525 28 diff --git a/collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt b/collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt index 7dcbebe6..956eb858 100644 --- a/collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt @@ -1,8 +1,8 @@ #; ( -fixnum-comparison.rkt line 12 col 4 - vector-length - vector-length -#f line #f col #f - op - string-length -fixnum-comparison.rkt line 12 col 1 - < - binary fixnum +fixnum-comparison.rkt 12:4 vector-length -- vector-length +#f (no location) op -- string-length +fixnum-comparison.rkt 12:1 < -- binary fixnum #t ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-comp.rkt b/collects/tests/typed-scheme/optimizer/tests/float-comp.rkt index 0cd0d1ef..6ad0dc32 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-comp.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-comp.rkt @@ -1,6 +1,6 @@ #; ( -float-comp.rkt line 10 col 1 - < - binary float comp +float-comp.rkt 10:1 < -- binary float comp #t ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate-top.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate-top.rkt index 004a0a38..3c79244e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate-top.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate-top.rkt @@ -1,10 +1,10 @@ #; ( -float-complex-conjugate-top.rkt line 14 col 14 - 1.0+2.0i - unboxed literal -float-complex-conjugate-top.rkt line 14 col 23 - 2.0+4.0i - unboxed literal -float-complex-conjugate-top.rkt line 14 col 12 - + - unboxed binary float complex -float-complex-conjugate-top.rkt line 14 col 1 - conjugate - unboxed unary float complex -float-complex-conjugate-top.rkt line 14 col 0 - (#%app conjugate (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) - unboxed float complex +float-complex-conjugate-top.rkt 14:14 1.0+2.0i -- unboxed literal +float-complex-conjugate-top.rkt 14:23 2.0+4.0i -- unboxed literal +float-complex-conjugate-top.rkt 14:12 + -- unboxed binary float complex +float-complex-conjugate-top.rkt 14:1 conjugate -- unboxed unary float complex +float-complex-conjugate-top.rkt 14:0 (#%app conjugate (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) -- unboxed float complex 3.0-6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate.rkt index 5ccabd70..64f5f62e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-conjugate.rkt @@ -1,11 +1,11 @@ #; ( -float-complex-conjugate.rkt line 15 col 14 - 1.0+2.0i - unboxed literal -float-complex-conjugate.rkt line 15 col 4 - conjugate - unboxed unary float complex -float-complex-conjugate.rkt line 15 col 35 - 2.0+4.0i - unboxed literal -float-complex-conjugate.rkt line 15 col 25 - conjugate - unboxed unary float complex -float-complex-conjugate.rkt line 15 col 1 - + - unboxed binary float complex -float-complex-conjugate.rkt line 15 col 0 - (#%app + (#%app conjugate (quote 1.0+2.0i)) (#%app conjugate (quote 2.0+4.0i))) - unboxed float complex +float-complex-conjugate.rkt 15:14 1.0+2.0i -- unboxed literal +float-complex-conjugate.rkt 15:4 conjugate -- unboxed unary float complex +float-complex-conjugate.rkt 15:35 2.0+4.0i -- unboxed literal +float-complex-conjugate.rkt 15:25 conjugate -- unboxed unary float complex +float-complex-conjugate.rkt 15:1 + -- unboxed binary float complex +float-complex-conjugate.rkt 15:0 (#%app + (#%app conjugate (quote 1.0+2.0i)) (#%app conjugate (quote 2.0+4.0i))) -- unboxed float complex 3.0-6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-div.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-div.rkt index d832839f..944f70f2 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-div.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-div.rkt @@ -1,10 +1,10 @@ #; ( -float-complex-div.rkt line 14 col 3 - 1.0+2.0i - unboxed literal -float-complex-div.rkt line 14 col 12 - 2.0+4.0i - unboxed literal -float-complex-div.rkt line 14 col 21 - 3.0+6.0i - unboxed literal -float-complex-div.rkt line 14 col 1 - / - unboxed binary float complex -float-complex-div.rkt line 14 col 0 - (#%app / (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i)) - unboxed float complex +float-complex-div.rkt 14:3 1.0+2.0i -- unboxed literal +float-complex-div.rkt 14:12 2.0+4.0i -- unboxed literal +float-complex-div.rkt 14:21 3.0+6.0i -- unboxed literal +float-complex-div.rkt 14:1 / -- unboxed binary float complex +float-complex-div.rkt 14:0 (#%app / (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i)) -- unboxed float complex 0.03333333333333333-0.06666666666666667i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-fixnum.rkt index 3846c610..4fe63e2a 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-fixnum.rkt @@ -1,13 +1,13 @@ #; ( -float-complex-fixnum.rkt line 17 col 4 - modulo - binary nonzero fixnum -float-complex-fixnum.rkt line 17 col 4 - modulo - binary nonzero fixnum -float-complex-fixnum.rkt line 17 col 4 - modulo - binary nonzero fixnum -float-complex-fixnum.rkt line 17 col 3 - (#%app modulo (quote 2) (quote 1)) - float-coerce-expr in complex ops -float-complex-fixnum.rkt line 17 col 16 - 1.0+2.0i - unboxed literal -float-complex-fixnum.rkt line 17 col 25 - 3.0+6.0i - unboxed literal -float-complex-fixnum.rkt line 17 col 1 - + - unboxed binary float complex -float-complex-fixnum.rkt line 17 col 0 - (#%app + (#%app modulo (quote 2) (quote 1)) (quote 1.0+2.0i) (quote 3.0+6.0i)) - unboxed float complex +float-complex-fixnum.rkt 17:4 modulo -- binary nonzero fixnum +float-complex-fixnum.rkt 17:4 modulo -- binary nonzero fixnum +float-complex-fixnum.rkt 17:4 modulo -- binary nonzero fixnum +float-complex-fixnum.rkt 17:3 (#%app modulo (quote 2) (quote 1)) -- float-coerce-expr in complex ops +float-complex-fixnum.rkt 17:16 1.0+2.0i -- unboxed literal +float-complex-fixnum.rkt 17:25 3.0+6.0i -- unboxed literal +float-complex-fixnum.rkt 17:1 + -- unboxed binary float complex +float-complex-fixnum.rkt 17:0 (#%app + (#%app modulo (quote 2) (quote 1)) (quote 1.0+2.0i) (quote 3.0+6.0i)) -- unboxed float complex 4.0+8.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-div.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-div.rkt index 4f6f6829..9656b6f6 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-div.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-div.rkt @@ -1,42 +1,42 @@ #; ( -float-complex-float-div.rkt line 47 col 62 - x - unbox float-complex -float-complex-float-div.rkt line 47 col 52 - real-part - unboxed float complex -float-complex-float-div.rkt line 48 col 62 - x - unbox float-complex -float-complex-float-div.rkt line 48 col 52 - imag-part - unboxed float complex -float-complex-float-div.rkt line 50 col 9 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 50 col 13 - 2.0+4.0i - unboxed literal -float-complex-float-div.rkt line 50 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 50 col 6 - (#%app / (quote 1.0) (quote 2.0+4.0i)) - unboxed float complex -float-complex-float-div.rkt line 51 col 9 - 1.0+2.0i - unboxed literal -float-complex-float-div.rkt line 51 col 18 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 51 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 51 col 6 - (#%app / (quote 1.0+2.0i) (quote 2.0)) - unboxed float complex -float-complex-float-div.rkt line 52 col 9 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 52 col 13 - 2.0+4.0i - unboxed literal -float-complex-float-div.rkt line 52 col 22 - 3.0+6.0i - unboxed literal -float-complex-float-div.rkt line 52 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 52 col 6 - (#%app / (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float-div.rkt line 53 col 9 - 1.0+2.0i - unboxed literal -float-complex-float-div.rkt line 53 col 18 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 53 col 22 - 3.0+6.0i - unboxed literal -float-complex-float-div.rkt line 53 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 53 col 6 - (#%app / (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float-div.rkt line 54 col 9 - 1.0+2.0i - unboxed literal -float-complex-float-div.rkt line 54 col 18 - 2.0+4.0i - unboxed literal -float-complex-float-div.rkt line 54 col 27 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 54 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 54 col 6 - (#%app / (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) - unboxed float complex -float-complex-float-div.rkt line 55 col 9 - 1.0+2.0i - unboxed literal -float-complex-float-div.rkt line 55 col 18 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 55 col 22 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 55 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 55 col 6 - (#%app / (quote 1.0+2.0i) (quote 2.0) (quote 3.0)) - unboxed float complex -float-complex-float-div.rkt line 56 col 9 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 56 col 13 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-div.rkt line 56 col 17 - 3.0+6.0i - unboxed literal -float-complex-float-div.rkt line 56 col 7 - / - unboxed binary float complex -float-complex-float-div.rkt line 56 col 6 - (#%app / (quote 1.0) (quote 2.0) (quote 3.0+6.0i)) - unboxed float complex +float-complex-float-div.rkt 47:62 x -- unbox float-complex +float-complex-float-div.rkt 47:52 real-part -- unboxed float complex +float-complex-float-div.rkt 48:62 x -- unbox float-complex +float-complex-float-div.rkt 48:52 imag-part -- unboxed float complex +float-complex-float-div.rkt 50:9 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 50:13 2.0+4.0i -- unboxed literal +float-complex-float-div.rkt 50:7 / -- unboxed binary float complex +float-complex-float-div.rkt 50:6 (#%app / (quote 1.0) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-float-div.rkt 51:9 1.0+2.0i -- unboxed literal +float-complex-float-div.rkt 51:18 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 51:7 / -- unboxed binary float complex +float-complex-float-div.rkt 51:6 (#%app / (quote 1.0+2.0i) (quote 2.0)) -- unboxed float complex +float-complex-float-div.rkt 52:9 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 52:13 2.0+4.0i -- unboxed literal +float-complex-float-div.rkt 52:22 3.0+6.0i -- unboxed literal +float-complex-float-div.rkt 52:7 / -- unboxed binary float complex +float-complex-float-div.rkt 52:6 (#%app / (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float-div.rkt 53:9 1.0+2.0i -- unboxed literal +float-complex-float-div.rkt 53:18 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 53:22 3.0+6.0i -- unboxed literal +float-complex-float-div.rkt 53:7 / -- unboxed binary float complex +float-complex-float-div.rkt 53:6 (#%app / (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float-div.rkt 54:9 1.0+2.0i -- unboxed literal +float-complex-float-div.rkt 54:18 2.0+4.0i -- unboxed literal +float-complex-float-div.rkt 54:27 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 54:7 / -- unboxed binary float complex +float-complex-float-div.rkt 54:6 (#%app / (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) -- unboxed float complex +float-complex-float-div.rkt 55:9 1.0+2.0i -- unboxed literal +float-complex-float-div.rkt 55:18 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 55:22 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 55:7 / -- unboxed binary float complex +float-complex-float-div.rkt 55:6 (#%app / (quote 1.0+2.0i) (quote 2.0) (quote 3.0)) -- unboxed float complex +float-complex-float-div.rkt 56:9 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 56:13 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-div.rkt 56:17 3.0+6.0i -- unboxed literal +float-complex-float-div.rkt 56:7 / -- unboxed binary float complex +float-complex-float-div.rkt 56:6 (#%app / (quote 1.0) (quote 2.0) (quote 3.0+6.0i)) -- unboxed float complex '("0.1000000000-0.2000000000" "0.50000000001.0000000000" "-0.0200000000-0.0266666667" "0.16666666670.0000000000" "0.16666666670.0000000000" "0.16666666670.3333333333" "0.0333333333-0.0666666667") ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-mul.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-mul.rkt index 068906d9..3aa8550c 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-mul.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-mul.rkt @@ -1,33 +1,33 @@ #; ( -float-complex-float-mul.rkt line 42 col 3 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 42 col 7 - 2.0+4.0i - unboxed literal -float-complex-float-mul.rkt line 42 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 42 col 0 - (#%app * (quote 1.0) (quote 2.0+4.0i)) - unboxed float complex -float-complex-float-mul.rkt line 43 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-mul.rkt line 43 col 12 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 43 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 43 col 0 - (#%app * (quote 1.0+2.0i) (quote 2.0)) - unboxed float complex -float-complex-float-mul.rkt line 44 col 3 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 44 col 7 - 2.0+4.0i - unboxed literal -float-complex-float-mul.rkt line 44 col 16 - 3.0+6.0i - unboxed literal -float-complex-float-mul.rkt line 44 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 44 col 0 - (#%app * (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float-mul.rkt line 45 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-mul.rkt line 45 col 12 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 45 col 16 - 3.0+6.0i - unboxed literal -float-complex-float-mul.rkt line 45 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 45 col 0 - (#%app * (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float-mul.rkt line 46 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-mul.rkt line 46 col 12 - 2.0+4.0i - unboxed literal -float-complex-float-mul.rkt line 46 col 21 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 46 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 46 col 0 - (#%app * (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) - unboxed float complex -float-complex-float-mul.rkt line 47 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-mul.rkt line 47 col 12 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 47 col 16 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-mul.rkt line 47 col 1 - * - unboxed binary float complex -float-complex-float-mul.rkt line 47 col 0 - (#%app * (quote 1.0+2.0i) (quote 2.0) (quote 3.0)) - unboxed float complex +float-complex-float-mul.rkt 42:3 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 42:7 2.0+4.0i -- unboxed literal +float-complex-float-mul.rkt 42:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 42:0 (#%app * (quote 1.0) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-float-mul.rkt 43:3 1.0+2.0i -- unboxed literal +float-complex-float-mul.rkt 43:12 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 43:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 43:0 (#%app * (quote 1.0+2.0i) (quote 2.0)) -- unboxed float complex +float-complex-float-mul.rkt 44:3 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 44:7 2.0+4.0i -- unboxed literal +float-complex-float-mul.rkt 44:16 3.0+6.0i -- unboxed literal +float-complex-float-mul.rkt 44:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 44:0 (#%app * (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float-mul.rkt 45:3 1.0+2.0i -- unboxed literal +float-complex-float-mul.rkt 45:12 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 45:16 3.0+6.0i -- unboxed literal +float-complex-float-mul.rkt 45:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 45:0 (#%app * (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float-mul.rkt 46:3 1.0+2.0i -- unboxed literal +float-complex-float-mul.rkt 46:12 2.0+4.0i -- unboxed literal +float-complex-float-mul.rkt 46:21 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 46:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 46:0 (#%app * (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) -- unboxed float complex +float-complex-float-mul.rkt 47:3 1.0+2.0i -- unboxed literal +float-complex-float-mul.rkt 47:12 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 47:16 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-mul.rkt 47:1 * -- unboxed binary float complex +float-complex-float-mul.rkt 47:0 (#%app * (quote 1.0+2.0i) (quote 2.0) (quote 3.0)) -- unboxed float complex 2.0+4.0i 2.0+4.0i -18.0+24.0i diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-small.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-small.rkt index b12f779c..4ab814ff 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-float-small.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-float-small.rkt @@ -1,28 +1,28 @@ #; ( -float-complex-float-small.rkt line 36 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-small.rkt line 36 col 12 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 36 col 1 - + - unboxed binary float complex -float-complex-float-small.rkt line 36 col 0 - (#%app + (quote 1.0+2.0i) (quote 3.0)) - unboxed float complex -float-complex-float-small.rkt line 37 col 3 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 37 col 7 - 2.0+4.0i - unboxed literal -float-complex-float-small.rkt line 37 col 1 - + - unboxed binary float complex -float-complex-float-small.rkt line 37 col 0 - (#%app + (quote 1.0) (quote 2.0+4.0i)) - unboxed float complex -float-complex-float-small.rkt line 38 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-small.rkt line 38 col 12 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 38 col 1 - - - unboxed binary float complex -float-complex-float-small.rkt line 38 col 0 - (#%app - (quote 1.0+2.0i) (quote 3.0)) - unboxed float complex -float-complex-float-small.rkt line 39 col 3 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 39 col 7 - 2.0+4.0i - unboxed literal -float-complex-float-small.rkt line 39 col 1 - - - unboxed binary float complex -float-complex-float-small.rkt line 39 col 0 - (#%app - (quote 1.0) (quote 2.0+4.0i)) - unboxed float complex -float-complex-float-small.rkt line 40 col 3 - 1.0+2.0i - unboxed literal -float-complex-float-small.rkt line 40 col 15 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 40 col 19 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 40 col 13 - + - binary float -float-complex-float-small.rkt line 40 col 12 - (#%app + (quote 1.0) (quote 2.0)) - float-coerce-expr in complex ops -float-complex-float-small.rkt line 40 col 1 - + - unboxed binary float complex -float-complex-float-small.rkt line 40 col 0 - (#%app + (quote 1.0+2.0i) (#%app + (quote 1.0) (quote 2.0))) - unboxed float complex +float-complex-float-small.rkt 36:3 1.0+2.0i -- unboxed literal +float-complex-float-small.rkt 36:12 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 36:1 + -- unboxed binary float complex +float-complex-float-small.rkt 36:0 (#%app + (quote 1.0+2.0i) (quote 3.0)) -- unboxed float complex +float-complex-float-small.rkt 37:3 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 37:7 2.0+4.0i -- unboxed literal +float-complex-float-small.rkt 37:1 + -- unboxed binary float complex +float-complex-float-small.rkt 37:0 (#%app + (quote 1.0) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-float-small.rkt 38:3 1.0+2.0i -- unboxed literal +float-complex-float-small.rkt 38:12 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 38:1 - -- unboxed binary float complex +float-complex-float-small.rkt 38:0 (#%app - (quote 1.0+2.0i) (quote 3.0)) -- unboxed float complex +float-complex-float-small.rkt 39:3 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 39:7 2.0+4.0i -- unboxed literal +float-complex-float-small.rkt 39:1 - -- unboxed binary float complex +float-complex-float-small.rkt 39:0 (#%app - (quote 1.0) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-float-small.rkt 40:3 1.0+2.0i -- unboxed literal +float-complex-float-small.rkt 40:15 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 40:19 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 40:13 + -- binary float +float-complex-float-small.rkt 40:12 (#%app + (quote 1.0) (quote 2.0)) -- float-coerce-expr in complex ops +float-complex-float-small.rkt 40:1 + -- unboxed binary float complex +float-complex-float-small.rkt 40:0 (#%app + (quote 1.0+2.0i) (#%app + (quote 1.0) (quote 2.0))) -- unboxed float complex 4.0+2.0i 3.0+4.0i -2.0+2.0i diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-float.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-float.rkt index 060813b5..f449f730 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-float.rkt @@ -1,25 +1,25 @@ #; ( -float-complex-float.rkt line 32 col 3 - 1.0+2.0i - unboxed literal -float-complex-float.rkt line 32 col 12 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float.rkt line 32 col 16 - 3.0+6.0i - unboxed literal -float-complex-float.rkt line 32 col 1 - + - unboxed binary float complex -float-complex-float.rkt line 32 col 0 - (#%app + (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float.rkt line 33 col 3 - (quote 1.0) - float-coerce-expr in complex ops -float-complex-float.rkt line 33 col 7 - 2.0+4.0i - unboxed literal -float-complex-float.rkt line 33 col 16 - 3.0+6.0i - unboxed literal -float-complex-float.rkt line 33 col 1 - - - unboxed binary float complex -float-complex-float.rkt line 33 col 0 - (#%app - (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float.rkt line 34 col 3 - 1.0+2.0i - unboxed literal -float-complex-float.rkt line 34 col 12 - (quote 2.0) - float-coerce-expr in complex ops -float-complex-float.rkt line 34 col 16 - 3.0+6.0i - unboxed literal -float-complex-float.rkt line 34 col 1 - - - unboxed binary float complex -float-complex-float.rkt line 34 col 0 - (#%app - (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) - unboxed float complex -float-complex-float.rkt line 35 col 3 - 1.0+2.0i - unboxed literal -float-complex-float.rkt line 35 col 12 - 2.0+4.0i - unboxed literal -float-complex-float.rkt line 35 col 21 - (quote 3.0) - float-coerce-expr in complex ops -float-complex-float.rkt line 35 col 1 - - - unboxed binary float complex -float-complex-float.rkt line 35 col 0 - (#%app - (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) - unboxed float complex +float-complex-float.rkt 32:3 1.0+2.0i -- unboxed literal +float-complex-float.rkt 32:12 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float.rkt 32:16 3.0+6.0i -- unboxed literal +float-complex-float.rkt 32:1 + -- unboxed binary float complex +float-complex-float.rkt 32:0 (#%app + (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float.rkt 33:3 (quote 1.0) -- float-coerce-expr in complex ops +float-complex-float.rkt 33:7 2.0+4.0i -- unboxed literal +float-complex-float.rkt 33:16 3.0+6.0i -- unboxed literal +float-complex-float.rkt 33:1 - -- unboxed binary float complex +float-complex-float.rkt 33:0 (#%app - (quote 1.0) (quote 2.0+4.0i) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float.rkt 34:3 1.0+2.0i -- unboxed literal +float-complex-float.rkt 34:12 (quote 2.0) -- float-coerce-expr in complex ops +float-complex-float.rkt 34:16 3.0+6.0i -- unboxed literal +float-complex-float.rkt 34:1 - -- unboxed binary float complex +float-complex-float.rkt 34:0 (#%app - (quote 1.0+2.0i) (quote 2.0) (quote 3.0+6.0i)) -- unboxed float complex +float-complex-float.rkt 35:3 1.0+2.0i -- unboxed literal +float-complex-float.rkt 35:12 2.0+4.0i -- unboxed literal +float-complex-float.rkt 35:21 (quote 3.0) -- float-coerce-expr in complex ops +float-complex-float.rkt 35:1 - -- unboxed binary float complex +float-complex-float.rkt 35:0 (#%app - (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0)) -- unboxed float complex 6.0+8.0i -4.0-10.0i -4.0-4.0i diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-i.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-i.rkt index 83e394cb..60cbd8e6 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-i.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-i.rkt @@ -1,11 +1,11 @@ #; ( -float-complex-i.rkt line 15 col 3 - 1.0+2.0i - unboxed literal -float-complex-i.rkt line 15 col 15 - 0+1.0i - unboxed literal -float-complex-i.rkt line 15 col 21 - 2.0+4.0i - unboxed literal -float-complex-i.rkt line 15 col 13 - * - unboxed binary float complex -float-complex-i.rkt line 15 col 1 - + - unboxed binary float complex -float-complex-i.rkt line 15 col 0 - (#%app + (quote 1.0+2.0i) (#%app * (quote 0+1.0i) (quote 2.0+4.0i))) - unboxed float complex +float-complex-i.rkt 15:3 1.0+2.0i -- unboxed literal +float-complex-i.rkt 15:15 0+1.0i -- unboxed literal +float-complex-i.rkt 15:21 2.0+4.0i -- unboxed literal +float-complex-i.rkt 15:13 * -- unboxed binary float complex +float-complex-i.rkt 15:1 + -- unboxed binary float complex +float-complex-i.rkt 15:0 (#%app + (quote 1.0+2.0i) (#%app * (quote 0+1.0i) (quote 2.0+4.0i))) -- unboxed float complex -3.0+4.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-integer.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-integer.rkt index b9033e5d..21e3f10f 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-integer.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-integer.rkt @@ -1,9 +1,9 @@ #; ( -float-complex-integer.rkt line 13 col 3 - (#%app expt (quote 2) (quote 100)) - float-coerce-expr in complex ops -float-complex-integer.rkt line 13 col 16 - 1.0+2.0i - unboxed literal -float-complex-integer.rkt line 13 col 1 - + - unboxed binary float complex -float-complex-integer.rkt line 13 col 0 - (#%app + (#%app expt (quote 2) (quote 100)) (quote 1.0+2.0i)) - unboxed float complex +float-complex-integer.rkt 13:3 (#%app expt (quote 2) (quote 100)) -- float-coerce-expr in complex ops +float-complex-integer.rkt 13:16 1.0+2.0i -- unboxed literal +float-complex-integer.rkt 13:1 + -- unboxed binary float complex +float-complex-integer.rkt 13:0 (#%app + (#%app expt (quote 2) (quote 100)) (quote 1.0+2.0i)) -- unboxed float complex 1.2676506002282294e+30+2.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-mult.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-mult.rkt index 0ad65681..46c5d63a 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-mult.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-mult.rkt @@ -1,10 +1,10 @@ #; ( -float-complex-mult.rkt line 14 col 3 - 1.0+2.0i - unboxed literal -float-complex-mult.rkt line 14 col 12 - 2.0+4.0i - unboxed literal -float-complex-mult.rkt line 14 col 21 - 3.0+6.0i - unboxed literal -float-complex-mult.rkt line 14 col 1 - * - unboxed binary float complex -float-complex-mult.rkt line 14 col 0 - (#%app * (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i)) - unboxed float complex +float-complex-mult.rkt 14:3 1.0+2.0i -- unboxed literal +float-complex-mult.rkt 14:12 2.0+4.0i -- unboxed literal +float-complex-mult.rkt 14:21 3.0+6.0i -- unboxed literal +float-complex-mult.rkt 14:1 * -- unboxed binary float complex +float-complex-mult.rkt 14:0 (#%app * (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i)) -- unboxed float complex -66.0-12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts.rkt index 4b3a63dc..9bfcc8a9 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts.rkt @@ -1,11 +1,11 @@ #; ( -float-complex-parts.rkt line 17 col 11 - 1.0+2.0i - unboxed literal -float-complex-parts.rkt line 17 col 1 - real-part - unboxed float complex -float-complex-parts.rkt line 18 col 11 - 1.0+2.0i - unboxed literal -float-complex-parts.rkt line 18 col 1 - imag-part - unboxed float complex -float-complex-parts.rkt line 19 col 11 - 1.0+2.0i - unboxed literal -float-complex-parts.rkt line 19 col 1 - real-part - unboxed float complex +float-complex-parts.rkt 17:11 1.0+2.0i -- unboxed literal +float-complex-parts.rkt 17:1 real-part -- unboxed float complex +float-complex-parts.rkt 18:11 1.0+2.0i -- unboxed literal +float-complex-parts.rkt 18:1 imag-part -- unboxed float complex +float-complex-parts.rkt 19:11 1.0+2.0i -- unboxed literal +float-complex-parts.rkt 19:1 real-part -- unboxed float complex 1.0 2.0 1.0 diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts2.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts2.rkt index cc1de957..8e5c927d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts2.rkt @@ -1,37 +1,37 @@ #; ( -float-complex-parts2.rkt line 46 col 14 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 46 col 23 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 46 col 12 - + - unboxed binary float complex -float-complex-parts2.rkt line 46 col 11 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -float-complex-parts2.rkt line 46 col 14 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 46 col 23 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 46 col 12 - + - unboxed binary float complex -float-complex-parts2.rkt line 46 col 1 - real-part - unboxed float complex -float-complex-parts2.rkt line 47 col 23 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 47 col 32 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 47 col 21 - + - unboxed binary float complex -float-complex-parts2.rkt line 47 col 20 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -float-complex-parts2.rkt line 47 col 23 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 47 col 32 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 47 col 21 - + - unboxed binary float complex -float-complex-parts2.rkt line 47 col 1 - unsafe-flreal-part - unboxed float complex -float-complex-parts2.rkt line 48 col 14 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 48 col 23 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 48 col 12 - + - unboxed binary float complex -float-complex-parts2.rkt line 48 col 11 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -float-complex-parts2.rkt line 48 col 14 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 48 col 23 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 48 col 12 - + - unboxed binary float complex -float-complex-parts2.rkt line 48 col 1 - imag-part - unboxed float complex -float-complex-parts2.rkt line 49 col 23 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 49 col 32 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 49 col 21 - + - unboxed binary float complex -float-complex-parts2.rkt line 49 col 20 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -float-complex-parts2.rkt line 49 col 23 - 1.0+2.0i - unboxed literal -float-complex-parts2.rkt line 49 col 32 - 2.0+4.0i - unboxed literal -float-complex-parts2.rkt line 49 col 21 - + - unboxed binary float complex -float-complex-parts2.rkt line 49 col 1 - unsafe-flimag-part - unboxed float complex +float-complex-parts2.rkt 46:14 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 46:23 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 46:12 + -- unboxed binary float complex +float-complex-parts2.rkt 46:11 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-parts2.rkt 46:14 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 46:23 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 46:12 + -- unboxed binary float complex +float-complex-parts2.rkt 46:1 real-part -- unboxed float complex +float-complex-parts2.rkt 47:23 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 47:32 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 47:21 + -- unboxed binary float complex +float-complex-parts2.rkt 47:20 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-parts2.rkt 47:23 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 47:32 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 47:21 + -- unboxed binary float complex +float-complex-parts2.rkt 47:1 unsafe-flreal-part -- unboxed float complex +float-complex-parts2.rkt 48:14 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 48:23 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 48:12 + -- unboxed binary float complex +float-complex-parts2.rkt 48:11 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-parts2.rkt 48:14 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 48:23 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 48:12 + -- unboxed binary float complex +float-complex-parts2.rkt 48:1 imag-part -- unboxed float complex +float-complex-parts2.rkt 49:23 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 49:32 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 49:21 + -- unboxed binary float complex +float-complex-parts2.rkt 49:20 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +float-complex-parts2.rkt 49:23 1.0+2.0i -- unboxed literal +float-complex-parts2.rkt 49:32 2.0+4.0i -- unboxed literal +float-complex-parts2.rkt 49:21 + -- unboxed binary float complex +float-complex-parts2.rkt 49:1 unsafe-flimag-part -- unboxed float complex 3.0 3.0 6.0 diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts3.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts3.rkt index 957c7d92..308298ca 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-parts3.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-parts3.rkt @@ -1,33 +1,33 @@ #; ( -float-complex-parts3.rkt line 42 col 3 - 1.0+2.0i - unboxed literal -float-complex-parts3.rkt line 42 col 26 - 2.0+4.0i - unboxed literal -float-complex-parts3.rkt line 42 col 35 - 3.0+6.0i - unboxed literal -float-complex-parts3.rkt line 42 col 24 - + - unboxed binary float complex -float-complex-parts3.rkt line 42 col 13 - real-part - unboxed unary float complex -float-complex-parts3.rkt line 42 col 1 - + - unboxed binary float complex -float-complex-parts3.rkt line 42 col 0 - (#%app + (quote 1.0+2.0i) (#%app real-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) - unboxed float complex -float-complex-parts3.rkt line 43 col 3 - 1.0+2.0i - unboxed literal -float-complex-parts3.rkt line 43 col 35 - 2.0+4.0i - unboxed literal -float-complex-parts3.rkt line 43 col 44 - 3.0+6.0i - unboxed literal -float-complex-parts3.rkt line 43 col 33 - + - unboxed binary float complex -float-complex-parts3.rkt line 43 col 13 - unsafe-flreal-part - unboxed unary float complex -float-complex-parts3.rkt line 43 col 1 - + - unboxed binary float complex -float-complex-parts3.rkt line 43 col 0 - (#%app + (quote 1.0+2.0i) (#%app unsafe-flreal-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) - unboxed float complex -float-complex-parts3.rkt line 44 col 3 - 1.0+2.0i - unboxed literal -float-complex-parts3.rkt line 44 col 26 - 2.0+4.0i - unboxed literal -float-complex-parts3.rkt line 44 col 35 - 3.0+6.0i - unboxed literal -float-complex-parts3.rkt line 44 col 24 - + - unboxed binary float complex -float-complex-parts3.rkt line 44 col 13 - imag-part - unboxed unary float complex -float-complex-parts3.rkt line 44 col 1 - + - unboxed binary float complex -float-complex-parts3.rkt line 44 col 0 - (#%app + (quote 1.0+2.0i) (#%app imag-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) - unboxed float complex -float-complex-parts3.rkt line 45 col 3 - 1.0+2.0i - unboxed literal -float-complex-parts3.rkt line 45 col 35 - 2.0+4.0i - unboxed literal -float-complex-parts3.rkt line 45 col 44 - 3.0+6.0i - unboxed literal -float-complex-parts3.rkt line 45 col 33 - + - unboxed binary float complex -float-complex-parts3.rkt line 45 col 13 - unsafe-flimag-part - unboxed unary float complex -float-complex-parts3.rkt line 45 col 1 - + - unboxed binary float complex -float-complex-parts3.rkt line 45 col 0 - (#%app + (quote 1.0+2.0i) (#%app unsafe-flimag-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) - unboxed float complex +float-complex-parts3.rkt 42:3 1.0+2.0i -- unboxed literal +float-complex-parts3.rkt 42:26 2.0+4.0i -- unboxed literal +float-complex-parts3.rkt 42:35 3.0+6.0i -- unboxed literal +float-complex-parts3.rkt 42:24 + -- unboxed binary float complex +float-complex-parts3.rkt 42:13 real-part -- unboxed unary float complex +float-complex-parts3.rkt 42:1 + -- unboxed binary float complex +float-complex-parts3.rkt 42:0 (#%app + (quote 1.0+2.0i) (#%app real-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) -- unboxed float complex +float-complex-parts3.rkt 43:3 1.0+2.0i -- unboxed literal +float-complex-parts3.rkt 43:35 2.0+4.0i -- unboxed literal +float-complex-parts3.rkt 43:44 3.0+6.0i -- unboxed literal +float-complex-parts3.rkt 43:33 + -- unboxed binary float complex +float-complex-parts3.rkt 43:13 unsafe-flreal-part -- unboxed unary float complex +float-complex-parts3.rkt 43:1 + -- unboxed binary float complex +float-complex-parts3.rkt 43:0 (#%app + (quote 1.0+2.0i) (#%app unsafe-flreal-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) -- unboxed float complex +float-complex-parts3.rkt 44:3 1.0+2.0i -- unboxed literal +float-complex-parts3.rkt 44:26 2.0+4.0i -- unboxed literal +float-complex-parts3.rkt 44:35 3.0+6.0i -- unboxed literal +float-complex-parts3.rkt 44:24 + -- unboxed binary float complex +float-complex-parts3.rkt 44:13 imag-part -- unboxed unary float complex +float-complex-parts3.rkt 44:1 + -- unboxed binary float complex +float-complex-parts3.rkt 44:0 (#%app + (quote 1.0+2.0i) (#%app imag-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) -- unboxed float complex +float-complex-parts3.rkt 45:3 1.0+2.0i -- unboxed literal +float-complex-parts3.rkt 45:35 2.0+4.0i -- unboxed literal +float-complex-parts3.rkt 45:44 3.0+6.0i -- unboxed literal +float-complex-parts3.rkt 45:33 + -- unboxed binary float complex +float-complex-parts3.rkt 45:13 unsafe-flimag-part -- unboxed unary float complex +float-complex-parts3.rkt 45:1 + -- unboxed binary float complex +float-complex-parts3.rkt 45:0 (#%app + (quote 1.0+2.0i) (#%app unsafe-flimag-part (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) -- unboxed float complex 6.0+2.0i 6.0+2.0i 11.0+2.0i diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex-sin.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex-sin.rkt index 0211deb0..f40eeab1 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex-sin.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex-sin.rkt @@ -1,9 +1,9 @@ #; ( -float-complex-sin.rkt line 14 col 13 - (#%app sin (#%app * t (quote 6.28))) - float-coerce-expr in complex ops -float-complex-sin.rkt line 14 col 30 - 0.0+0.0i - unboxed literal -float-complex-sin.rkt line 14 col 11 - + - unboxed binary float complex -float-complex-sin.rkt line 14 col 10 - (#%app + (#%app sin (#%app * t (quote 6.28))) (quote 0.0+0.0i)) - unboxed float complex +float-complex-sin.rkt 14:13 (#%app sin (#%app * t (quote 6.28))) -- float-coerce-expr in complex ops +float-complex-sin.rkt 14:30 0.0+0.0i -- unboxed literal +float-complex-sin.rkt 14:11 + -- unboxed binary float complex +float-complex-sin.rkt 14:10 (#%app + (#%app sin (#%app * t (quote 6.28))) (quote 0.0+0.0i)) -- unboxed float complex -0.0031853017931379904+0.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/float-complex.rkt index 64721469..97bed595 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-complex.rkt @@ -1,13 +1,13 @@ #; ( -float-complex.rkt line 18 col 3 - 1.0+2.0i - unboxed literal -float-complex.rkt line 18 col 12 - 2.0+4.0i - unboxed literal -float-complex.rkt line 18 col 1 - + - unboxed binary float complex -float-complex.rkt line 18 col 0 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -float-complex.rkt line 19 col 3 - 1.0+2.0i - unboxed literal -float-complex.rkt line 19 col 12 - 2.0+4.0i - unboxed literal -float-complex.rkt line 19 col 1 - - - unboxed binary float complex -float-complex.rkt line 19 col 0 - (#%app - (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex +float-complex.rkt 18:3 1.0+2.0i -- unboxed literal +float-complex.rkt 18:12 2.0+4.0i -- unboxed literal +float-complex.rkt 18:1 + -- unboxed binary float complex +float-complex.rkt 18:0 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +float-complex.rkt 19:3 1.0+2.0i -- unboxed literal +float-complex.rkt 19:12 2.0+4.0i -- unboxed literal +float-complex.rkt 19:1 - -- unboxed binary float complex +float-complex.rkt 19:0 (#%app - (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex 3.0+6.0i -1.0-2.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/float-fun.rkt b/collects/tests/typed-scheme/optimizer/tests/float-fun.rkt index b659085c..9f8c823d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-fun.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-fun.rkt @@ -1,6 +1,6 @@ #; ( -float-fun.rkt line 12 col 3 - + - binary float +float-fun.rkt 12:3 + -- binary float ) #lang typed/racket diff --git a/collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt b/collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt index 09a956c5..e69dfad9 100644 --- a/collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt @@ -1,9 +1,9 @@ #; ( -float-promotion.rkt line 14 col 4 - modulo - binary nonzero fixnum -float-promotion.rkt line 14 col 4 - modulo - binary nonzero fixnum -float-promotion.rkt line 14 col 1 - + - binary float -float-promotion.rkt line 15 col 1 - + - binary float +float-promotion.rkt 14:4 modulo -- binary nonzero fixnum +float-promotion.rkt 14:4 modulo -- binary nonzero fixnum +float-promotion.rkt 14:1 + -- binary float +float-promotion.rkt 15:1 + -- binary float 2.0 1e+200 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt index 5d30913b..49c2e9ed 100644 --- a/collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt @@ -1,6 +1,6 @@ #; ( -flvector-length.rkt line 10 col 1 - flvector-length - flvector-length +flvector-length.rkt 10:1 flvector-length -- flvector-length 2 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt b/collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt index 7e63776a..c9d97c50 100644 --- a/collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt @@ -1,6 +1,6 @@ #; ( -fx-fl.rkt line 10 col 1 - exact->inexact - fixnum to float +fx-fl.rkt 10:1 exact->inexact -- fixnum to float 1.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt index 1835fe3f..c4197f56 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt @@ -1,6 +1,6 @@ #; ( -#f line #f col #f - make-sequence - in-bytes +#f (no location) make-sequence -- in-bytes 495051) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-list.rkt b/collects/tests/typed-scheme/optimizer/tests/in-list.rkt index d32781de..4691f6a6 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-list.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-list.rkt @@ -1,6 +1,6 @@ #; ( -#f line #f col #f - make-sequence - in-list +#f (no location) make-sequence -- in-list 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-string.rkt b/collects/tests/typed-scheme/optimizer/tests/in-string.rkt index 869316f4..d0440960 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-string.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-string.rkt @@ -1,6 +1,6 @@ #; ( -#f line #f col #f - make-sequence - in-string +#f (no location) make-sequence -- in-string 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt b/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt index cabc9474..b7b895af 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt @@ -1,6 +1,6 @@ #; ( -#f line #f col #f - make-sequence - in-vector +#f (no location) make-sequence -- in-vector 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt index 283a9c37..7ba6df1b 100644 --- a/collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt @@ -1,6 +1,6 @@ #; ( -invalid-exact-inexact.rkt line 9 col 1 - exact->inexact - float to float +invalid-exact-inexact.rkt 9:1 exact->inexact -- float to float 1.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt index b7eb57fb..d0202372 100644 --- a/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt @@ -1,29 +1,29 @@ #; ( -invalid-unboxed-let.rkt line 38 col 14 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 17 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 12 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 38 col 11 - (#%app + t1 t1) - unboxed float complex -invalid-unboxed-let.rkt line 38 col 14 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 17 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 12 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 38 col 11 - (#%app + t1 t1) - unboxed float complex -invalid-unboxed-let.rkt line 38 col 14 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 17 - t1 - unbox float-complex -invalid-unboxed-let.rkt line 38 col 12 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 38 col 11 - (#%app + t1 t1) - unboxed float complex -invalid-unboxed-let.rkt line 34 col 13 - 1.0+2.0i - unboxed literal -invalid-unboxed-let.rkt line 34 col 22 - 2.0+4.0i - unboxed literal -invalid-unboxed-let.rkt line 34 col 11 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 35 col 13 - 3.0+6.0i - unboxed literal -invalid-unboxed-let.rkt line 35 col 22 - 4.0+8.0i - unboxed literal -invalid-unboxed-let.rkt line 35 col 11 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 35 col 10 - (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)) - unboxed float complex -invalid-unboxed-let.rkt line 34 col 0 - (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) ((t2) (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i))) ((t3) (quote 1.0+2.0i)) ((t4) (quote 1))) (#%app display (#%app + t1 t1)) (#%app display t2) (#%app display t3) (#%app display t4)) - unboxed let bindings -invalid-unboxed-let.rkt line 38 col 14 - t1 - leave var unboxed -invalid-unboxed-let.rkt line 38 col 17 - t1 - leave var unboxed -invalid-unboxed-let.rkt line 38 col 12 - + - unboxed binary float complex -invalid-unboxed-let.rkt line 38 col 11 - (#%app + t1 t1) - unboxed float complex +invalid-unboxed-let.rkt 38:14 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:17 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:12 + -- unboxed binary float complex +invalid-unboxed-let.rkt 38:11 (#%app + t1 t1) -- unboxed float complex +invalid-unboxed-let.rkt 38:14 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:17 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:12 + -- unboxed binary float complex +invalid-unboxed-let.rkt 38:11 (#%app + t1 t1) -- unboxed float complex +invalid-unboxed-let.rkt 38:14 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:17 t1 -- unbox float-complex +invalid-unboxed-let.rkt 38:12 + -- unboxed binary float complex +invalid-unboxed-let.rkt 38:11 (#%app + t1 t1) -- unboxed float complex +invalid-unboxed-let.rkt 34:13 1.0+2.0i -- unboxed literal +invalid-unboxed-let.rkt 34:22 2.0+4.0i -- unboxed literal +invalid-unboxed-let.rkt 34:11 + -- unboxed binary float complex +invalid-unboxed-let.rkt 35:13 3.0+6.0i -- unboxed literal +invalid-unboxed-let.rkt 35:22 4.0+8.0i -- unboxed literal +invalid-unboxed-let.rkt 35:11 + -- unboxed binary float complex +invalid-unboxed-let.rkt 35:10 (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)) -- unboxed float complex +invalid-unboxed-let.rkt 34:0 (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) ((t2) (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i))) ((t3) (quote 1.0+2.0i)) ((t4) (quote 1))) (#%app display (#%app + t1 t1)) (#%app display t2) (#%app display t3) (#%app display t4)) -- unboxed let bindings +invalid-unboxed-let.rkt 38:14 t1 -- leave var unboxed +invalid-unboxed-let.rkt 38:17 t1 -- leave var unboxed +invalid-unboxed-let.rkt 38:12 + -- unboxed binary float complex +invalid-unboxed-let.rkt 38:11 (#%app + t1 t1) -- unboxed float complex 6.0+12.0i7.0+14.0i1.0+2.0i1) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt index ff2dd31f..8dd35df6 100644 --- a/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt @@ -1,17 +1,17 @@ #; ( -invalid-unboxed-let2.rkt line 24 col 33 - 1.0+2.0i - unboxed literal -invalid-unboxed-let2.rkt line 24 col 42 - 2.0+4.0i - unboxed literal -invalid-unboxed-let2.rkt line 24 col 31 - + - unboxed binary float complex -invalid-unboxed-let2.rkt line 24 col 30 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex -invalid-unboxed-let2.rkt line 24 col 55 - 3.0+6.0i - unboxed literal -invalid-unboxed-let2.rkt line 24 col 64 - 4.0+8.0i - unboxed literal -invalid-unboxed-let2.rkt line 24 col 53 - + - unboxed binary float complex -invalid-unboxed-let2.rkt line 24 col 52 - (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)) - unboxed float complex -invalid-unboxed-let2.rkt line 25 col 5 - t1 - unbox float-complex -invalid-unboxed-let2.rkt line 25 col 8 - t2 - unbox float-complex -invalid-unboxed-let2.rkt line 25 col 3 - + - unboxed binary float complex -invalid-unboxed-let2.rkt line 25 col 2 - (#%app + t1 t2) - unboxed float complex +invalid-unboxed-let2.rkt 24:33 1.0+2.0i -- unboxed literal +invalid-unboxed-let2.rkt 24:42 2.0+4.0i -- unboxed literal +invalid-unboxed-let2.rkt 24:31 + -- unboxed binary float complex +invalid-unboxed-let2.rkt 24:30 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex +invalid-unboxed-let2.rkt 24:55 3.0+6.0i -- unboxed literal +invalid-unboxed-let2.rkt 24:64 4.0+8.0i -- unboxed literal +invalid-unboxed-let2.rkt 24:53 + -- unboxed binary float complex +invalid-unboxed-let2.rkt 24:52 (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)) -- unboxed float complex +invalid-unboxed-let2.rkt 25:5 t1 -- unbox float-complex +invalid-unboxed-let2.rkt 25:8 t2 -- unbox float-complex +invalid-unboxed-let2.rkt 25:3 + -- unboxed binary float complex +invalid-unboxed-let2.rkt 25:2 (#%app + t1 t2) -- unboxed float complex 10.0+20.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt index ca37593f..551fdfff 100644 --- a/collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt @@ -1,7 +1,7 @@ #; ( -known-vector-length.rkt line 11 col 6 - vector-length - known-length vector-length -known-vector-length.rkt line 11 col 1 - + - fixnum bounded expr +known-vector-length.rkt 11:6 vector-length -- known-length vector-length +known-vector-length.rkt 11:1 + -- fixnum bounded expr 4 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/let-float.rkt b/collects/tests/typed-scheme/optimizer/tests/let-float.rkt index a7e6d6fa..23324b35 100644 --- a/collects/tests/typed-scheme/optimizer/tests/let-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/let-float.rkt @@ -1,7 +1,7 @@ #; ( -let-float.rkt line 11 col 10 - + - binary float -let-float.rkt line 12 col 3 - * - binary float +let-float.rkt 11:10 + -- binary float +let-float.rkt 12:3 * -- binary float 45.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt b/collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt index 4ffc7ce5..2d5cd420 100644 --- a/collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt @@ -1,6 +1,6 @@ #; ( -let-rhs.rkt line 12 col 10 - + - binary float +let-rhs.rkt 12:10 + -- binary float 3.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/literal-int.rkt b/collects/tests/typed-scheme/optimizer/tests/literal-int.rkt index 7b54c8f5..11033cbe 100644 --- a/collects/tests/typed-scheme/optimizer/tests/literal-int.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/literal-int.rkt @@ -1,6 +1,6 @@ #; ( -literal-int.rkt line 13 col 1 - + - binary float +literal-int.rkt 13:1 + -- binary float 3.0 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/magnitude.rkt b/collects/tests/typed-scheme/optimizer/tests/magnitude.rkt index 0615ba8b..0bf98f10 100644 --- a/collects/tests/typed-scheme/optimizer/tests/magnitude.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/magnitude.rkt @@ -1,8 +1,8 @@ #; ( -magnitude.rkt line 14 col 11 - 3.0+4.0i - unboxed literal -magnitude.rkt line 14 col 1 - magnitude - unboxed unary float complex -magnitude.rkt line 14 col 0 - (#%app magnitude (quote 3.0+4.0i)) - unboxed float complex->float +magnitude.rkt 14:11 3.0+4.0i -- unboxed literal +magnitude.rkt 14:1 magnitude -- unboxed unary float complex +magnitude.rkt 14:0 (#%app magnitude (quote 3.0+4.0i)) -- unboxed float complex->float 5.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt index 10e2ce82..7d00a41f 100644 --- a/collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt @@ -1,7 +1,7 @@ #; ( -make-flrectangular.rkt line 12 col 1 - make-rectangular - binary float comp -make-flrectangular.rkt line 13 col 1 - make-flrectangular - binary float comp +make-flrectangular.rkt 12:1 make-rectangular -- binary float comp +make-flrectangular.rkt 13:1 make-flrectangular -- binary float comp 1.0+2.2i 1.0+2.2i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/make-polar.rkt b/collects/tests/typed-scheme/optimizer/tests/make-polar.rkt index 8fdd9f2e..681b7c9b 100644 --- a/collects/tests/typed-scheme/optimizer/tests/make-polar.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/make-polar.rkt @@ -1,20 +1,20 @@ #; ( -make-polar.rkt line 28 col 1 - make-polar - make-rectangular elimination -make-polar.rkt line 28 col 1 - make-polar - make-polar -make-polar.rkt line 32 col 50 - p - unbox float-complex -make-polar.rkt line 32 col 40 - real-part - unboxed unary float complex -make-polar.rkt line 32 col 39 - (#%app real-part p) - unboxed float complex->float -make-polar.rkt line 31 col 12 - 1.0+2.0i - unboxed literal -make-polar.rkt line 31 col 22 - make-polar - make-rectangular elimination -make-polar.rkt line 31 col 10 - + - unboxed binary float complex -make-polar.rkt line 31 col 0 - (let-values (((p) (#%app + (quote 1.0+2.0i) (#%app make-polar (quote 2.0) (quote 4.0))))) (#%app string-append (#%app real->decimal-string (#%app real-part p) (quote 10)) (#%app real->decimal-string (#%app imag-part p) (quote 10)))) - unboxed let bindings -make-polar.rkt line 32 col 50 - p - unboxed complex variable -make-polar.rkt line 32 col 50 - p - leave var unboxed -make-polar.rkt line 32 col 40 - real-part - unboxed float complex -make-polar.rkt line 33 col 50 - p - unboxed complex variable -make-polar.rkt line 33 col 50 - p - leave var unboxed -make-polar.rkt line 33 col 40 - imag-part - unboxed float complex +make-polar.rkt 28:1 make-polar -- make-rectangular elimination +make-polar.rkt 28:1 make-polar -- make-polar +make-polar.rkt 32:50 p -- unbox float-complex +make-polar.rkt 32:40 real-part -- unboxed unary float complex +make-polar.rkt 32:39 (#%app real-part p) -- unboxed float complex->float +make-polar.rkt 31:12 1.0+2.0i -- unboxed literal +make-polar.rkt 31:22 make-polar -- make-rectangular elimination +make-polar.rkt 31:10 + -- unboxed binary float complex +make-polar.rkt 31:0 (let-values (((p) (#%app + (quote 1.0+2.0i) (#%app make-polar (quote 2.0) (quote 4.0))))) (#%app string-append (#%app real->decimal-string (#%app real-part p) (quote 10)) (#%app real->decimal-string (#%app imag-part p) (quote 10)))) -- unboxed let bindings +make-polar.rkt 32:50 p -- unboxed complex variable +make-polar.rkt 32:50 p -- leave var unboxed +make-polar.rkt 32:40 real-part -- unboxed float complex +make-polar.rkt 33:50 p -- unboxed complex variable +make-polar.rkt 33:50 p -- leave var unboxed +make-polar.rkt 33:40 imag-part -- unboxed float complex 0.5403023058681398+0.8414709848078965i "-0.30728724170.4863950094" ) diff --git a/collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt index 12877a75..ffa6af9b 100644 --- a/collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt @@ -1,9 +1,9 @@ #; ( -maybe-exact-complex.rkt line 15 col 3 - 1.0+2.0i - unboxed literal -maybe-exact-complex.rkt line 15 col 12 - 2+4i - unboxed literal -maybe-exact-complex.rkt line 15 col 1 - + - unboxed binary float complex -maybe-exact-complex.rkt line 15 col 0 - (#%app + (quote 1.0+2.0i) (quote 2+4i)) - unboxed float complex +maybe-exact-complex.rkt 15:3 1.0+2.0i -- unboxed literal +maybe-exact-complex.rkt 15:12 2+4i -- unboxed literal +maybe-exact-complex.rkt 15:1 + -- unboxed binary float complex +maybe-exact-complex.rkt 15:0 (#%app + (quote 1.0+2.0i) (quote 2+4i)) -- unboxed float complex 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/mpair.rkt b/collects/tests/typed-scheme/optimizer/tests/mpair.rkt index 6cf8381b..3a4c9af7 100644 --- a/collects/tests/typed-scheme/optimizer/tests/mpair.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/mpair.rkt @@ -1,12 +1,12 @@ #; ( -mpair.rkt line 19 col 1 - mcar - mutable pair -mpair.rkt line 20 col 1 - mcdr - mutable pair -mpair.rkt line 21 col 1 - set-mcar! - mutable pair -mpair.rkt line 21 col 14 - + - fixnum bounded expr -mpair.rkt line 22 col 1 - set-mcdr! - mutable pair -mpair.rkt line 22 col 14 - + - binary float -mpair.rkt line 28 col 7 - mcar - mutable pair +mpair.rkt 19:1 mcar -- mutable pair +mpair.rkt 20:1 mcdr -- mutable pair +mpair.rkt 21:1 set-mcar! -- mutable pair +mpair.rkt 21:14 + -- fixnum bounded expr +mpair.rkt 22:1 set-mcdr! -- mutable pair +mpair.rkt 22:14 + -- binary float +mpair.rkt 28:7 mcar -- mutable pair 1 1.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/n-ary-float-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/n-ary-float-complex.rkt index 44416db9..ef0ba6e3 100644 --- a/collects/tests/typed-scheme/optimizer/tests/n-ary-float-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/n-ary-float-complex.rkt @@ -1,11 +1,11 @@ #; ( -n-ary-float-complex.rkt line 15 col 3 - 1.0+2.0i - unboxed literal -n-ary-float-complex.rkt line 15 col 12 - 2.0+4.0i - unboxed literal -n-ary-float-complex.rkt line 15 col 21 - 3.0+6.0i - unboxed literal -n-ary-float-complex.rkt line 15 col 30 - 4.0+8.0i - unboxed literal -n-ary-float-complex.rkt line 15 col 1 - + - unboxed binary float complex -n-ary-float-complex.rkt line 15 col 0 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i) (quote 4.0+8.0i)) - unboxed float complex +n-ary-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal +n-ary-float-complex.rkt 15:12 2.0+4.0i -- unboxed literal +n-ary-float-complex.rkt 15:21 3.0+6.0i -- unboxed literal +n-ary-float-complex.rkt 15:30 4.0+8.0i -- unboxed literal +n-ary-float-complex.rkt 15:1 + -- unboxed binary float complex +n-ary-float-complex.rkt 15:0 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i) (quote 3.0+6.0i) (quote 4.0+8.0i)) -- unboxed float complex 10.0+20.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt b/collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt index 5a02f030..9e163993 100644 --- a/collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt @@ -1,6 +1,6 @@ #; ( -n-ary-float.rkt line 10 col 1 - + - binary float +n-ary-float.rkt 10:1 + -- binary float 6.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-float-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-float-complex.rkt index 850de65b..1528b57a 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-float-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-float-complex.rkt @@ -1,11 +1,11 @@ #; ( -nested-float-complex.rkt line 15 col 3 - 1.0+2.0i - unboxed literal -nested-float-complex.rkt line 15 col 15 - 2.0+4.0i - unboxed literal -nested-float-complex.rkt line 15 col 24 - 3.0+6.0i - unboxed literal -nested-float-complex.rkt line 15 col 13 - - - unboxed binary float complex -nested-float-complex.rkt line 15 col 1 - + - unboxed binary float complex -nested-float-complex.rkt line 15 col 0 - (#%app + (quote 1.0+2.0i) (#%app - (quote 2.0+4.0i) (quote 3.0+6.0i))) - unboxed float complex +nested-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal +nested-float-complex.rkt 15:15 2.0+4.0i -- unboxed literal +nested-float-complex.rkt 15:24 3.0+6.0i -- unboxed literal +nested-float-complex.rkt 15:13 - -- unboxed binary float complex +nested-float-complex.rkt 15:1 + -- unboxed binary float complex +nested-float-complex.rkt 15:0 (#%app + (quote 1.0+2.0i) (#%app - (quote 2.0+4.0i) (quote 3.0+6.0i))) -- unboxed float complex 0.0+0.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-float.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-float.rkt index 326150d9..9ddfcae6 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-float.rkt @@ -1,7 +1,7 @@ #; ( -nested-float.rkt line 11 col 8 - + - binary float -nested-float.rkt line 11 col 1 - + - binary float +nested-float.rkt 11:8 + -- binary float +nested-float.rkt 11:1 + -- binary float 9.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt index 942424a1..4c9f934c 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt @@ -1,7 +1,7 @@ #; ( -nested-float2.rkt line 11 col 8 - * - binary float -nested-float2.rkt line 11 col 1 - + - binary float +nested-float2.rkt 11:8 * -- binary float +nested-float2.rkt 11:1 + -- binary float 14.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt index ce926a25..d9bd9876 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt @@ -1,41 +1,41 @@ #; ( -nested-let-loop.rkt line 56 col 38 - r - unbox float-complex -nested-let-loop.rkt line 56 col 40 - s - unbox float-complex -nested-let-loop.rkt line 56 col 36 - + - unboxed binary float complex -nested-let-loop.rkt line 56 col 35 - (#%app + r s) - unboxed float complex -nested-let-loop.rkt line 49 col 8 - r - unboxed var -> table -nested-let-loop.rkt line 47 col 6 - loop1 - unboxed function -> table -nested-let-loop.rkt line 47 col 6 - loop1 - fun -> unboxed fun -nested-let-loop.rkt line 51 col 10 - r - unboxed complex variable -nested-let-loop.rkt line 56 col 38 - r - leave var unboxed -nested-let-loop.rkt line 56 col 40 - s - unbox float-complex -nested-let-loop.rkt line 56 col 36 - + - unboxed binary float complex -nested-let-loop.rkt line 56 col 35 - (#%app + r s) - unboxed float complex -nested-let-loop.rkt line 54 col 18 - s - unboxed var -> table -nested-let-loop.rkt line 52 col 16 - loop2 - unboxed function -> table -nested-let-loop.rkt line 52 col 16 - loop2 - fun -> unboxed fun -nested-let-loop.rkt line 56 col 38 - r - leave var unboxed -nested-let-loop.rkt line 56 col 40 - s - leave var unboxed -nested-let-loop.rkt line 56 col 36 - + - unboxed binary float complex -nested-let-loop.rkt line 56 col 21 - loop1 - unboxed call site -nested-let-loop.rkt line 56 col 28 - cdr - pair -nested-let-loop.rkt line 56 col 21 - loop1 - call to fun with unboxed args -nested-let-loop.rkt line 57 col 38 - s - leave var unboxed -nested-let-loop.rkt line 57 col 40 - (#%app car x) - unbox float-complex -nested-let-loop.rkt line 57 col 41 - car - pair -nested-let-loop.rkt line 57 col 48 - (#%app car y) - unbox float-complex -nested-let-loop.rkt line 57 col 49 - car - pair -nested-let-loop.rkt line 57 col 36 - + - unboxed binary float complex -nested-let-loop.rkt line 57 col 21 - loop2 - unboxed call site -nested-let-loop.rkt line 57 col 28 - cdr - pair -nested-let-loop.rkt line 57 col 21 - loop2 - call to fun with unboxed args -nested-let-loop.rkt line 54 col 38 - 0.0+0.0i - unboxed literal -#f line #f col #f - (letrec-values (((loop2) (lambda (y s) (if (#%app null? y) (#%app loop1 (#%app cdr x) (#%app + r s)) (#%app loop2 (#%app cdr y) (#%app + s (#%app car x) (#%app car y))))))) loop2) - unboxed call site -nested-let-loop.rkt line 52 col 16 - loop2 - unboxed let loop -nested-let-loop.rkt line 49 col 28 - 0.0+0.0i - unboxed literal -#f line #f col #f - (letrec-values (((loop1) (lambda (x r) (if (#%app null? x) r (#%app (letrec-values (((loop2) (lambda (y s) (if (#%app null? y) (#%app loop1 (#%app cdr x) (#%app + r s)) (#%app loop2 (#%app cdr y) (#%app + s (#%app car x) (#%app car y))))))) loop2) (quote (3.0+6.0i 4.0+8.0i)) (quote 0.0+0.0i)))))) loop1) - unboxed call site -nested-let-loop.rkt line 47 col 6 - loop1 - unboxed let loop +nested-let-loop.rkt 56:38 r -- unbox float-complex +nested-let-loop.rkt 56:40 s -- unbox float-complex +nested-let-loop.rkt 56:36 + -- unboxed binary float complex +nested-let-loop.rkt 56:35 (#%app + r s) -- unboxed float complex +nested-let-loop.rkt 49:8 r -- unboxed var -> table +nested-let-loop.rkt 47:6 loop1 -- unboxed function -> table +nested-let-loop.rkt 47:6 loop1 -- fun -> unboxed fun +nested-let-loop.rkt 51:10 r -- unboxed complex variable +nested-let-loop.rkt 56:38 r -- leave var unboxed +nested-let-loop.rkt 56:40 s -- unbox float-complex +nested-let-loop.rkt 56:36 + -- unboxed binary float complex +nested-let-loop.rkt 56:35 (#%app + r s) -- unboxed float complex +nested-let-loop.rkt 54:18 s -- unboxed var -> table +nested-let-loop.rkt 52:16 loop2 -- unboxed function -> table +nested-let-loop.rkt 52:16 loop2 -- fun -> unboxed fun +nested-let-loop.rkt 56:38 r -- leave var unboxed +nested-let-loop.rkt 56:40 s -- leave var unboxed +nested-let-loop.rkt 56:36 + -- unboxed binary float complex +nested-let-loop.rkt 56:21 loop1 -- unboxed call site +nested-let-loop.rkt 56:28 cdr -- pair +nested-let-loop.rkt 56:21 loop1 -- call to fun with unboxed args +nested-let-loop.rkt 57:38 s -- leave var unboxed +nested-let-loop.rkt 57:40 (#%app car x) -- unbox float-complex +nested-let-loop.rkt 57:41 car -- pair +nested-let-loop.rkt 57:48 (#%app car y) -- unbox float-complex +nested-let-loop.rkt 57:49 car -- pair +nested-let-loop.rkt 57:36 + -- unboxed binary float complex +nested-let-loop.rkt 57:21 loop2 -- unboxed call site +nested-let-loop.rkt 57:28 cdr -- pair +nested-let-loop.rkt 57:21 loop2 -- call to fun with unboxed args +nested-let-loop.rkt 54:38 0.0+0.0i -- unboxed literal +#f (no location) (letrec-values (((loop2) (lambda (y s) (if (#%app null? y) (#%app loop1 (#%app cdr x) (#%app + r s)) (#%app loop2 (#%app cdr y) (#%app + s (#%app car x) (#%app car y))))))) loop2) -- unboxed call site +nested-let-loop.rkt 52:16 loop2 -- unboxed let loop +nested-let-loop.rkt 49:28 0.0+0.0i -- unboxed literal +#f (no location) (letrec-values (((loop1) (lambda (x r) (if (#%app null? x) r (#%app (letrec-values (((loop2) (lambda (y s) (if (#%app null? y) (#%app loop1 (#%app cdr x) (#%app + r s)) (#%app loop2 (#%app cdr y) (#%app + s (#%app car x) (#%app car y))))))) loop2) (quote (3.0+6.0i 4.0+8.0i)) (quote 0.0+0.0i)))))) loop1) -- unboxed call site +nested-let-loop.rkt 47:6 loop1 -- unboxed let loop 20.0+40.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt index 7e8a92fc..d18b33cd 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt @@ -1,7 +1,7 @@ #; ( -nested-pair1.rkt line 11 col 6 - cdr - pair -nested-pair1.rkt line 11 col 1 - car - pair +nested-pair1.rkt 11:6 cdr -- pair +nested-pair1.rkt 11:1 car -- pair 2 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt index d43ba10f..54f71fb1 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt @@ -1,7 +1,7 @@ #; ( -nested-pair2.rkt line 11 col 6 - cdr - pair -nested-pair2.rkt line 11 col 1 - car - pair +nested-pair2.rkt 11:6 cdr -- pair +nested-pair2.rkt 11:1 car -- pair '(2) ) diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt index 20569e8c..1cce5db8 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt @@ -1,25 +1,25 @@ #; ( -nested-unboxed-let.rkt line 32 col 14 - x - unbox float-complex -nested-unboxed-let.rkt line 32 col 16 - 2.0+3.0i - unboxed literal -nested-unboxed-let.rkt line 32 col 12 - + - unboxed binary float complex -nested-unboxed-let.rkt line 32 col 11 - (#%app + x (quote 2.0+3.0i)) - unboxed float complex -nested-unboxed-let.rkt line 31 col 12 - 1.0+2.0i - unboxed literal -nested-unboxed-let.rkt line 31 col 21 - 2.0+3.0i - unboxed literal -nested-unboxed-let.rkt line 31 col 10 - + - unboxed binary float complex -nested-unboxed-let.rkt line 31 col 0 - (let-values (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+3.0i)))) (let-values (((x) (#%app + x (quote 2.0+3.0i)))) (#%app + x (quote 3.0+6.0i)))) - unboxed let bindings -nested-unboxed-let.rkt line 33 col 7 - x - unbox float-complex -nested-unboxed-let.rkt line 33 col 9 - 3.0+6.0i - unboxed literal -nested-unboxed-let.rkt line 33 col 5 - + - unboxed binary float complex -nested-unboxed-let.rkt line 33 col 4 - (#%app + x (quote 3.0+6.0i)) - unboxed float complex -nested-unboxed-let.rkt line 32 col 14 - x - leave var unboxed -nested-unboxed-let.rkt line 32 col 16 - 2.0+3.0i - unboxed literal -nested-unboxed-let.rkt line 32 col 12 - + - unboxed binary float complex -nested-unboxed-let.rkt line 32 col 2 - (let-values (((x) (#%app + x (quote 2.0+3.0i)))) (#%app + x (quote 3.0+6.0i))) - unboxed let bindings -nested-unboxed-let.rkt line 33 col 7 - x - leave var unboxed -nested-unboxed-let.rkt line 33 col 9 - 3.0+6.0i - unboxed literal -nested-unboxed-let.rkt line 33 col 5 - + - unboxed binary float complex -nested-unboxed-let.rkt line 33 col 4 - (#%app + x (quote 3.0+6.0i)) - unboxed float complex +nested-unboxed-let.rkt 32:14 x -- unbox float-complex +nested-unboxed-let.rkt 32:16 2.0+3.0i -- unboxed literal +nested-unboxed-let.rkt 32:12 + -- unboxed binary float complex +nested-unboxed-let.rkt 32:11 (#%app + x (quote 2.0+3.0i)) -- unboxed float complex +nested-unboxed-let.rkt 31:12 1.0+2.0i -- unboxed literal +nested-unboxed-let.rkt 31:21 2.0+3.0i -- unboxed literal +nested-unboxed-let.rkt 31:10 + -- unboxed binary float complex +nested-unboxed-let.rkt 31:0 (let-values (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+3.0i)))) (let-values (((x) (#%app + x (quote 2.0+3.0i)))) (#%app + x (quote 3.0+6.0i)))) -- unboxed let bindings +nested-unboxed-let.rkt 33:7 x -- unbox float-complex +nested-unboxed-let.rkt 33:9 3.0+6.0i -- unboxed literal +nested-unboxed-let.rkt 33:5 + -- unboxed binary float complex +nested-unboxed-let.rkt 33:4 (#%app + x (quote 3.0+6.0i)) -- unboxed float complex +nested-unboxed-let.rkt 32:14 x -- leave var unboxed +nested-unboxed-let.rkt 32:16 2.0+3.0i -- unboxed literal +nested-unboxed-let.rkt 32:12 + -- unboxed binary float complex +nested-unboxed-let.rkt 32:2 (let-values (((x) (#%app + x (quote 2.0+3.0i)))) (#%app + x (quote 3.0+6.0i))) -- unboxed let bindings +nested-unboxed-let.rkt 33:7 x -- leave var unboxed +nested-unboxed-let.rkt 33:9 3.0+6.0i -- unboxed literal +nested-unboxed-let.rkt 33:5 + -- unboxed binary float complex +nested-unboxed-let.rkt 33:4 (#%app + x (quote 3.0+6.0i)) -- unboxed float complex 8.0+14.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt b/collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt index 4b8af710..27141722 100644 --- a/collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt @@ -1,20 +1,20 @@ #; ( -one-arg-arith.rkt line 40 col 1 - - - unary fixnum -one-arg-arith.rkt line 41 col 1 - - - unary float -one-arg-arith.rkt line 42 col 1 - / - unary float -one-arg-arith.rkt line 44 col 1 - + - unary number -one-arg-arith.rkt line 45 col 1 - + - unary number -one-arg-arith.rkt line 46 col 1 - + - unary number -one-arg-arith.rkt line 47 col 1 - * - unary number -one-arg-arith.rkt line 48 col 1 - * - unary number -one-arg-arith.rkt line 49 col 1 - * - unary number -one-arg-arith.rkt line 50 col 1 - min - unary number -one-arg-arith.rkt line 51 col 1 - min - unary number -one-arg-arith.rkt line 52 col 1 - min - unary number -one-arg-arith.rkt line 53 col 1 - max - unary number -one-arg-arith.rkt line 54 col 1 - max - unary number -one-arg-arith.rkt line 55 col 1 - max - unary number +one-arg-arith.rkt 40:1 - -- unary fixnum +one-arg-arith.rkt 41:1 - -- unary float +one-arg-arith.rkt 42:1 / -- unary float +one-arg-arith.rkt 44:1 + -- unary number +one-arg-arith.rkt 45:1 + -- unary number +one-arg-arith.rkt 46:1 + -- unary number +one-arg-arith.rkt 47:1 * -- unary number +one-arg-arith.rkt 48:1 * -- unary number +one-arg-arith.rkt 49:1 * -- unary number +one-arg-arith.rkt 50:1 min -- unary number +one-arg-arith.rkt 51:1 min -- unary number +one-arg-arith.rkt 52:1 min -- unary number +one-arg-arith.rkt 53:1 max -- unary number +one-arg-arith.rkt 54:1 max -- unary number +one-arg-arith.rkt 55:1 max -- unary number -12 -12.0 0.23809523809523808 diff --git a/collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt b/collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt index b369f81e..be042547 100644 --- a/collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt @@ -1,6 +1,6 @@ #; ( -pair-fun.rkt line 13 col 7 - car - pair +pair-fun.rkt 13:7 car -- pair ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/pair-known-length-list.rkt b/collects/tests/typed-scheme/optimizer/tests/pair-known-length-list.rkt index 96f4c232..a488056d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/pair-known-length-list.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/pair-known-length-list.rkt @@ -1,17 +1,17 @@ #; ( -pair-known-length-list.rkt line 27 col 1 - car - pair -pair-known-length-list.rkt line 28 col 1 - cdr - pair -pair-known-length-list.rkt line 29 col 6 - cdr - pair -pair-known-length-list.rkt line 29 col 1 - car - pair -pair-known-length-list.rkt line 30 col 6 - cdr - pair -pair-known-length-list.rkt line 30 col 1 - cdr - pair -pair-known-length-list.rkt line 31 col 11 - cdr - pair -pair-known-length-list.rkt line 31 col 6 - cdr - pair -pair-known-length-list.rkt line 31 col 1 - car - pair -pair-known-length-list.rkt line 32 col 11 - cdr - pair -pair-known-length-list.rkt line 32 col 6 - cdr - pair -pair-known-length-list.rkt line 32 col 1 - cdr - pair +pair-known-length-list.rkt 27:1 car -- pair +pair-known-length-list.rkt 28:1 cdr -- pair +pair-known-length-list.rkt 29:6 cdr -- pair +pair-known-length-list.rkt 29:1 car -- pair +pair-known-length-list.rkt 30:6 cdr -- pair +pair-known-length-list.rkt 30:1 cdr -- pair +pair-known-length-list.rkt 31:11 cdr -- pair +pair-known-length-list.rkt 31:6 cdr -- pair +pair-known-length-list.rkt 31:1 car -- pair +pair-known-length-list.rkt 32:11 cdr -- pair +pair-known-length-list.rkt 32:6 cdr -- pair +pair-known-length-list.rkt 32:1 cdr -- pair 1 '(2 3) 2 diff --git a/collects/tests/typed-scheme/optimizer/tests/rational-literal.rkt b/collects/tests/typed-scheme/optimizer/tests/rational-literal.rkt index d6250d7e..3a9b4543 100644 --- a/collects/tests/typed-scheme/optimizer/tests/rational-literal.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/rational-literal.rkt @@ -1,6 +1,6 @@ #; ( -rational-literal.rkt line 8 col 1 - + - binary float +rational-literal.rkt 8:1 + -- binary float 1.95 ) #lang typed/racket #:optimize diff --git a/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt index b6bb0384..7a60dc98 100644 --- a/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt @@ -1,23 +1,23 @@ #; ( -real-part-loop.rkt line 31 col 20 - v - unbox float-complex -real-part-loop.rkt line 31 col 10 - real-part - unboxed unary float complex -real-part-loop.rkt line 31 col 9 - (#%app real-part v) - unboxed float complex->float -real-part-loop.rkt line 30 col 13 - v - unboxed var -> table -real-part-loop.rkt line 30 col 6 - loop - unboxed function -> table -real-part-loop.rkt line 30 col 6 - loop - fun -> unboxed fun -real-part-loop.rkt line 31 col 20 - v - unboxed complex variable -real-part-loop.rkt line 31 col 20 - v - leave var unboxed -real-part-loop.rkt line 31 col 10 - real-part - unboxed float complex -real-part-loop.rkt line 31 col 7 - > - binary float comp -real-part-loop.rkt line 33 col 15 - v - leave var unboxed -real-part-loop.rkt line 33 col 17 - (quote 3.6) - float-coerce-expr in complex ops -real-part-loop.rkt line 33 col 13 - + - unboxed binary float complex -real-part-loop.rkt line 33 col 7 - loop - unboxed call site -real-part-loop.rkt line 33 col 7 - loop - call to fun with unboxed args -real-part-loop.rkt line 30 col 15 - 0.0+1.0i - unboxed literal -real-part-loop.rkt line 30 col 1 - (letrec-values (((loop) (lambda (v) (if (#%app > (#%app real-part v) (quote 70000.2)) (quote 0) (#%app loop (#%app + v (quote 3.6))))))) loop) - unboxed call site -real-part-loop.rkt line 30 col 6 - loop - unboxed let loop +real-part-loop.rkt 31:20 v -- unbox float-complex +real-part-loop.rkt 31:10 real-part -- unboxed unary float complex +real-part-loop.rkt 31:9 (#%app real-part v) -- unboxed float complex->float +real-part-loop.rkt 30:13 v -- unboxed var -> table +real-part-loop.rkt 30:6 loop -- unboxed function -> table +real-part-loop.rkt 30:6 loop -- fun -> unboxed fun +real-part-loop.rkt 31:20 v -- unboxed complex variable +real-part-loop.rkt 31:20 v -- leave var unboxed +real-part-loop.rkt 31:10 real-part -- unboxed float complex +real-part-loop.rkt 31:7 > -- binary float comp +real-part-loop.rkt 33:15 v -- leave var unboxed +real-part-loop.rkt 33:17 (quote 3.6) -- float-coerce-expr in complex ops +real-part-loop.rkt 33:13 + -- unboxed binary float complex +real-part-loop.rkt 33:7 loop -- unboxed call site +real-part-loop.rkt 33:7 loop -- call to fun with unboxed args +real-part-loop.rkt 30:15 0.0+1.0i -- unboxed literal +real-part-loop.rkt 30:1 (letrec-values (((loop) (lambda (v) (if (#%app > (#%app real-part v) (quote 70000.2)) (quote 0) (#%app loop (#%app + v (quote 3.6))))))) loop) -- unboxed call site +real-part-loop.rkt 30:6 loop -- unboxed let loop 0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/silent-dead-branch.rkt b/collects/tests/typed-scheme/optimizer/tests/silent-dead-branch.rkt index 27015a8f..b4cd4a0a 100644 --- a/collects/tests/typed-scheme/optimizer/tests/silent-dead-branch.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/silent-dead-branch.rkt @@ -1,6 +1,6 @@ #; ( - silent-dead-branch.rkt line 12 col 0 - (let-values () (quote 1)) - dead then branch + silent-dead-branch.rkt 12:0 (let-values () (quote 1)) -- dead then branch ) #lang typed/racket diff --git a/collects/tests/typed-scheme/optimizer/tests/simple-float.rkt b/collects/tests/typed-scheme/optimizer/tests/simple-float.rkt index 26b3550c..8a94e1f2 100644 --- a/collects/tests/typed-scheme/optimizer/tests/simple-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/simple-float.rkt @@ -1,6 +1,6 @@ #; ( -simple-float.rkt line 10 col 1 - + - binary float +simple-float.rkt 10:1 + -- binary float 5.0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt b/collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt index a4586341..20dc52e5 100644 --- a/collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt @@ -1,6 +1,6 @@ #; ( -simple-pair.rkt line 10 col 1 - car - pair +simple-pair.rkt 10:1 car -- pair 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt b/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt index 39e25781..2c16a955 100644 --- a/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt @@ -1,7 +1,7 @@ #; ( -sqrt-segfault.rkt line 18 col 15 - - - binary float -sqrt-segfault.rkt line 19 col 15 - * - binary float +sqrt-segfault.rkt 18:15 - -- binary float +sqrt-segfault.rkt 19:15 * -- binary float ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/sqrt.rkt b/collects/tests/typed-scheme/optimizer/tests/sqrt.rkt index cb5669a3..6bf60a82 100644 --- a/collects/tests/typed-scheme/optimizer/tests/sqrt.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/sqrt.rkt @@ -1,6 +1,6 @@ #; ( -sqrt.rkt line 11 col 3 - sqrt - unary float +sqrt.rkt 11:3 sqrt -- unary float ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/string-length.rkt b/collects/tests/typed-scheme/optimizer/tests/string-length.rkt index 76cb9976..0e788b60 100644 --- a/collects/tests/typed-scheme/optimizer/tests/string-length.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/string-length.rkt @@ -1,7 +1,7 @@ #; ( -#f line #f col #f - op - string-length -#f line #f col #f - op - bytes-length +#f (no location) op -- string-length +#f (no location) op -- bytes-length 2 2 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/structs.rkt b/collects/tests/typed-scheme/optimizer/tests/structs.rkt index be8e651a..2922ab30 100644 --- a/collects/tests/typed-scheme/optimizer/tests/structs.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/structs.rkt @@ -1,7 +1,7 @@ #; ( -structs.rkt line 13 col 1 - pt-x - struct ref -structs.rkt line 14 col 1 - set-pt-y! - struct set +structs.rkt 13:1 pt-x -- struct ref +structs.rkt 14:1 set-pt-y! -- struct set 3 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt index 6ce57123..3cd5d0f4 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt @@ -1,7 +1,7 @@ #; ( -unary-fixnum-nested.rkt line 11 col 14 - bitwise-not - unary fixnum -unary-fixnum-nested.rkt line 11 col 1 - bitwise-not - unary fixnum +unary-fixnum-nested.rkt 11:14 bitwise-not -- unary fixnum +unary-fixnum-nested.rkt 11:1 bitwise-not -- unary fixnum 3 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt index 51bb989b..9dda413e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt @@ -1,6 +1,6 @@ #; ( -unary-fixnum.rkt line 10 col 1 - bitwise-not - unary fixnum +unary-fixnum.rkt 10:1 bitwise-not -- unary fixnum -5 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unary-float.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-float.rkt index 6d20a253..ca78e7b5 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unary-float.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unary-float.rkt @@ -1,6 +1,6 @@ #; ( -unary-float.rkt line 10 col 1 - sin - unary float +unary-float.rkt 10:1 sin -- unary float 0.9092974268256817 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt index 0f696ecf..5cf7ea28 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt @@ -1,45 +1,45 @@ #; ( -#f line #f col #f - make-sequence - in-list -unboxed-for.rkt line 53 col 9 - i - unbox float-complex -unboxed-for.rkt line 53 col 11 - sum - unbox float-complex -unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex -unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -unboxed-for.rkt line 53 col 9 - i - unbox float-complex -unboxed-for.rkt line 53 col 11 - sum - unbox float-complex -unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex -unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -unboxed-for.rkt line 51 col 31 - sum - unboxed var -> table -#f line #f col #f - for-loop - unboxed function -> table -#f line #f col #f - for-loop - fun -> unboxed fun -unboxed-for.rkt line 51 col 31 - sum - unboxed complex variable -unboxed-for.rkt line 53 col 9 - i - unbox float-complex -unboxed-for.rkt line 53 col 11 - sum - unbox float-complex -unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex -unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -#f line #f col #f - (#%app pos->vals pos) - unbox float-complex -#f line #f col #f - (let-values (((i) (#%app pos->vals pos))) (if (#%expression (if val-cont? (#%app val-cont? i) (quote #t))) (let-values (((sum) (let-values (((sum) sum)) (let-values () (#%app + i sum))))) (if (#%expression (if all-cont? (#%app all-cont? pos i) (quote #t))) (#%app for-loop sum (#%app pos-next pos)) sum)) sum)) - unboxed let bindings -unboxed-for.rkt line 52 col 13 - i - unboxed complex variable -unboxed-for.rkt line 52 col 13 - i - unboxed complex variable -unboxed-for.rkt line 53 col 9 - i - leave var unboxed -unboxed-for.rkt line 53 col 11 - sum - unbox float-complex -unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex -unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -unboxed-for.rkt line 51 col 31 - sum - leave var unboxed -#f line #f col #f - (let-values (((sum) sum)) (let-values () (#%app + i sum))) - unboxed let bindings -unboxed-for.rkt line 53 col 9 - i - leave var unboxed -unboxed-for.rkt line 53 col 11 - sum - leave var unboxed -unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex -unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -unboxed-for.rkt line 52 col 13 - i - unboxed complex variable -unboxed-for.rkt line 51 col 31 - sum - unbox float-complex -#f line #f col #f - for-loop - unboxed call site -#f line #f col #f - for-loop - call to fun with unboxed args -unboxed-for.rkt line 51 col 31 - sum - unboxed complex variable -unboxed-for.rkt line 51 col 31 - sum - unboxed complex variable -unboxed-for.rkt line 51 col 53 - 0.0+0.0i - unboxed literal -unboxed-for.rkt line 51 col 0 - (letrec-values (((for-loop) (lambda (sum pos) (if (#%expression (if pos-cont? (#%app pos-cont? pos) (quote #t))) (let-values (((i) (#%app pos->vals pos))) (if (#%expression (if val-cont? (#%app val-cont? i) (quote #t))) (let-values (((sum) (let-values (((sum) sum)) (let-values () (#%app + i sum))))) (if (#%expression (if all-cont? (#%app all-cont? pos i) (quote #t))) (#%app for-loop sum (#%app pos-next pos)) sum)) sum)) sum)))) for-loop) - unboxed call site -#f line #f col #f - for-loop - unboxed let loop +#f (no location) make-sequence -- in-list +unboxed-for.rkt 53:9 i -- unbox float-complex +unboxed-for.rkt 53:11 sum -- unbox float-complex +unboxed-for.rkt 53:7 + -- unboxed binary float complex +unboxed-for.rkt 53:6 (#%app + i sum) -- unboxed float complex +unboxed-for.rkt 53:9 i -- unbox float-complex +unboxed-for.rkt 53:11 sum -- unbox float-complex +unboxed-for.rkt 53:7 + -- unboxed binary float complex +unboxed-for.rkt 53:6 (#%app + i sum) -- unboxed float complex +unboxed-for.rkt 51:31 sum -- unboxed var -> table +#f (no location) for-loop -- unboxed function -> table +#f (no location) for-loop -- fun -> unboxed fun +unboxed-for.rkt 51:31 sum -- unboxed complex variable +unboxed-for.rkt 53:9 i -- unbox float-complex +unboxed-for.rkt 53:11 sum -- unbox float-complex +unboxed-for.rkt 53:7 + -- unboxed binary float complex +unboxed-for.rkt 53:6 (#%app + i sum) -- unboxed float complex +#f (no location) (#%app pos->vals pos) -- unbox float-complex +#f (no location) (let-values (((i) (#%app pos->vals pos))) (if (#%expression (if val-cont? (#%app val-cont? i) (quote #t))) (let-values (((sum) (let-values (((sum) sum)) (let-values () (#%app + i sum))))) (if (#%expression (if all-cont? (#%app all-cont? pos i) (quote #t))) (#%app for-loop sum (#%app pos-next pos)) sum)) sum)) -- unboxed let bindings +unboxed-for.rkt 52:13 i -- unboxed complex variable +unboxed-for.rkt 52:13 i -- unboxed complex variable +unboxed-for.rkt 53:9 i -- leave var unboxed +unboxed-for.rkt 53:11 sum -- unbox float-complex +unboxed-for.rkt 53:7 + -- unboxed binary float complex +unboxed-for.rkt 53:6 (#%app + i sum) -- unboxed float complex +unboxed-for.rkt 51:31 sum -- leave var unboxed +#f (no location) (let-values (((sum) sum)) (let-values () (#%app + i sum))) -- unboxed let bindings +unboxed-for.rkt 53:9 i -- leave var unboxed +unboxed-for.rkt 53:11 sum -- leave var unboxed +unboxed-for.rkt 53:7 + -- unboxed binary float complex +unboxed-for.rkt 53:6 (#%app + i sum) -- unboxed float complex +unboxed-for.rkt 52:13 i -- unboxed complex variable +unboxed-for.rkt 51:31 sum -- unbox float-complex +#f (no location) for-loop -- unboxed call site +#f (no location) for-loop -- call to fun with unboxed args +unboxed-for.rkt 51:31 sum -- unboxed complex variable +unboxed-for.rkt 51:31 sum -- unboxed complex variable +unboxed-for.rkt 51:53 0.0+0.0i -- unboxed literal +unboxed-for.rkt 51:0 (letrec-values (((for-loop) (lambda (sum pos) (if (#%expression (if pos-cont? (#%app pos-cont? pos) (quote #t))) (let-values (((i) (#%app pos->vals pos))) (if (#%expression (if val-cont? (#%app val-cont? i) (quote #t))) (let-values (((sum) (let-values (((sum) sum)) (let-values () (#%app + i sum))))) (if (#%expression (if all-cont? (#%app all-cont? pos i) (quote #t))) (#%app for-loop sum (#%app pos-next pos)) sum)) sum)) sum)))) for-loop) -- unboxed call site +#f (no location) for-loop -- unboxed let loop 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt index be9c8625..d70bb4f0 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt @@ -1,21 +1,21 @@ #; ( -unboxed-let-functions1.rkt line 28 col 45 - x - unbox float-complex -unboxed-let-functions1.rkt line 28 col 47 - 3.0+6.0i - unboxed literal -unboxed-let-functions1.rkt line 28 col 43 - + - unboxed binary float complex -unboxed-let-functions1.rkt line 28 col 42 - (#%app + x (quote 3.0+6.0i)) - unboxed float complex -unboxed-let-functions1.rkt line 28 col 20 - x - unboxed var -> table -unboxed-let-functions1.rkt line 28 col 7 - f - unboxed function -> table -unboxed-let-functions1.rkt line 28 col 7 - f - fun -> unboxed fun -unboxed-let-functions1.rkt line 28 col 45 - x - leave var unboxed -unboxed-let-functions1.rkt line 28 col 47 - 3.0+6.0i - unboxed literal -unboxed-let-functions1.rkt line 28 col 43 - + - unboxed binary float complex -unboxed-let-functions1.rkt line 28 col 42 - (#%app + x (quote 3.0+6.0i)) - unboxed float complex -unboxed-let-functions1.rkt line 29 col 8 - 1.0+2.0i - unboxed literal -unboxed-let-functions1.rkt line 29 col 17 - 2.0+4.0i - unboxed literal -unboxed-let-functions1.rkt line 29 col 6 - + - unboxed binary float complex -unboxed-let-functions1.rkt line 29 col 3 - f - unboxed call site -unboxed-let-functions1.rkt line 29 col 3 - f - call to fun with unboxed args +unboxed-let-functions1.rkt 28:45 x -- unbox float-complex +unboxed-let-functions1.rkt 28:47 3.0+6.0i -- unboxed literal +unboxed-let-functions1.rkt 28:43 + -- unboxed binary float complex +unboxed-let-functions1.rkt 28:42 (#%app + x (quote 3.0+6.0i)) -- unboxed float complex +unboxed-let-functions1.rkt 28:20 x -- unboxed var -> table +unboxed-let-functions1.rkt 28:7 f -- unboxed function -> table +unboxed-let-functions1.rkt 28:7 f -- fun -> unboxed fun +unboxed-let-functions1.rkt 28:45 x -- leave var unboxed +unboxed-let-functions1.rkt 28:47 3.0+6.0i -- unboxed literal +unboxed-let-functions1.rkt 28:43 + -- unboxed binary float complex +unboxed-let-functions1.rkt 28:42 (#%app + x (quote 3.0+6.0i)) -- unboxed float complex +unboxed-let-functions1.rkt 29:8 1.0+2.0i -- unboxed literal +unboxed-let-functions1.rkt 29:17 2.0+4.0i -- unboxed literal +unboxed-let-functions1.rkt 29:6 + -- unboxed binary float complex +unboxed-let-functions1.rkt 29:3 f -- unboxed call site +unboxed-let-functions1.rkt 29:3 f -- call to fun with unboxed args 6.0+12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt index 12184377..e4938788 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt @@ -1,27 +1,27 @@ #; ( -unboxed-let-functions2.rkt line 35 col 21 - x - unbox float-complex -unboxed-let-functions2.rkt line 35 col 23 - y - unbox float-complex -unboxed-let-functions2.rkt line 35 col 19 - + - unboxed binary float complex -unboxed-let-functions2.rkt line 35 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions2.rkt line 34 col 20 - x - unboxed var -> table -unboxed-let-functions2.rkt line 35 col 21 - x - unbox float-complex -unboxed-let-functions2.rkt line 35 col 23 - y - unbox float-complex -unboxed-let-functions2.rkt line 35 col 19 - + - unboxed binary float complex -unboxed-let-functions2.rkt line 35 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions2.rkt line 34 col 42 - y - unboxed var -> table -unboxed-let-functions2.rkt line 34 col 7 - f - unboxed function -> table -unboxed-let-functions2.rkt line 34 col 7 - f - fun -> unboxed fun -unboxed-let-functions2.rkt line 35 col 21 - x - leave var unboxed -unboxed-let-functions2.rkt line 35 col 23 - y - leave var unboxed -unboxed-let-functions2.rkt line 35 col 19 - + - unboxed binary float complex -unboxed-let-functions2.rkt line 35 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions2.rkt line 36 col 8 - 1.0+2.0i - unboxed literal -unboxed-let-functions2.rkt line 36 col 17 - 2.0+4.0i - unboxed literal -unboxed-let-functions2.rkt line 36 col 6 - + - unboxed binary float complex -unboxed-let-functions2.rkt line 37 col 5 - 3.0+6.0i - unboxed literal -unboxed-let-functions2.rkt line 36 col 3 - f - unboxed call site -unboxed-let-functions2.rkt line 36 col 3 - f - call to fun with unboxed args +unboxed-let-functions2.rkt 35:21 x -- unbox float-complex +unboxed-let-functions2.rkt 35:23 y -- unbox float-complex +unboxed-let-functions2.rkt 35:19 + -- unboxed binary float complex +unboxed-let-functions2.rkt 35:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions2.rkt 34:20 x -- unboxed var -> table +unboxed-let-functions2.rkt 35:21 x -- unbox float-complex +unboxed-let-functions2.rkt 35:23 y -- unbox float-complex +unboxed-let-functions2.rkt 35:19 + -- unboxed binary float complex +unboxed-let-functions2.rkt 35:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions2.rkt 34:42 y -- unboxed var -> table +unboxed-let-functions2.rkt 34:7 f -- unboxed function -> table +unboxed-let-functions2.rkt 34:7 f -- fun -> unboxed fun +unboxed-let-functions2.rkt 35:21 x -- leave var unboxed +unboxed-let-functions2.rkt 35:23 y -- leave var unboxed +unboxed-let-functions2.rkt 35:19 + -- unboxed binary float complex +unboxed-let-functions2.rkt 35:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions2.rkt 36:8 1.0+2.0i -- unboxed literal +unboxed-let-functions2.rkt 36:17 2.0+4.0i -- unboxed literal +unboxed-let-functions2.rkt 36:6 + -- unboxed binary float complex +unboxed-let-functions2.rkt 37:5 3.0+6.0i -- unboxed literal +unboxed-let-functions2.rkt 36:3 f -- unboxed call site +unboxed-let-functions2.rkt 36:3 f -- call to fun with unboxed args 6.0+12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt index 0e41fbde..0980468d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt @@ -1,21 +1,21 @@ #; ( -unboxed-let-functions3.rkt line 29 col 21 - x - unbox float-complex -unboxed-let-functions3.rkt line 29 col 23 - y - float-coerce-expr in complex ops -unboxed-let-functions3.rkt line 29 col 19 - + - unboxed binary float complex -unboxed-let-functions3.rkt line 29 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions3.rkt line 28 col 20 - x - unboxed var -> table -unboxed-let-functions3.rkt line 28 col 7 - f - unboxed function -> table -unboxed-let-functions3.rkt line 28 col 7 - f - fun -> unboxed fun -unboxed-let-functions3.rkt line 29 col 21 - x - leave var unboxed -unboxed-let-functions3.rkt line 29 col 23 - y - float-coerce-expr in complex ops -unboxed-let-functions3.rkt line 29 col 19 - + - unboxed binary float complex -unboxed-let-functions3.rkt line 29 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions3.rkt line 30 col 8 - 1.0+2.0i - unboxed literal -unboxed-let-functions3.rkt line 30 col 17 - 2.0+4.0i - unboxed literal -unboxed-let-functions3.rkt line 30 col 6 - + - unboxed binary float complex -unboxed-let-functions3.rkt line 30 col 3 - f - unboxed call site -unboxed-let-functions3.rkt line 30 col 3 - f - call to fun with unboxed args +unboxed-let-functions3.rkt 29:21 x -- unbox float-complex +unboxed-let-functions3.rkt 29:23 y -- float-coerce-expr in complex ops +unboxed-let-functions3.rkt 29:19 + -- unboxed binary float complex +unboxed-let-functions3.rkt 29:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions3.rkt 28:20 x -- unboxed var -> table +unboxed-let-functions3.rkt 28:7 f -- unboxed function -> table +unboxed-let-functions3.rkt 28:7 f -- fun -> unboxed fun +unboxed-let-functions3.rkt 29:21 x -- leave var unboxed +unboxed-let-functions3.rkt 29:23 y -- float-coerce-expr in complex ops +unboxed-let-functions3.rkt 29:19 + -- unboxed binary float complex +unboxed-let-functions3.rkt 29:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions3.rkt 30:8 1.0+2.0i -- unboxed literal +unboxed-let-functions3.rkt 30:17 2.0+4.0i -- unboxed literal +unboxed-let-functions3.rkt 30:6 + -- unboxed binary float complex +unboxed-let-functions3.rkt 30:3 f -- unboxed call site +unboxed-let-functions3.rkt 30:3 f -- call to fun with unboxed args 6.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt index 4a8c8eef..9f36ff38 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt @@ -1,21 +1,21 @@ #; ( -unboxed-let-functions4.rkt line 29 col 21 - x - unbox float-complex -unboxed-let-functions4.rkt line 29 col 23 - y - float-coerce-expr in complex ops -unboxed-let-functions4.rkt line 29 col 19 - + - unboxed binary float complex -unboxed-let-functions4.rkt line 29 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions4.rkt line 28 col 32 - x - unboxed var -> table -unboxed-let-functions4.rkt line 28 col 7 - f - unboxed function -> table -unboxed-let-functions4.rkt line 28 col 7 - f - fun -> unboxed fun -unboxed-let-functions4.rkt line 29 col 21 - x - leave var unboxed -unboxed-let-functions4.rkt line 29 col 23 - y - float-coerce-expr in complex ops -unboxed-let-functions4.rkt line 29 col 19 - + - unboxed binary float complex -unboxed-let-functions4.rkt line 29 col 18 - (#%app + x y) - unboxed float complex -unboxed-let-functions4.rkt line 31 col 8 - 1.0+2.0i - unboxed literal -unboxed-let-functions4.rkt line 31 col 17 - 2.0+4.0i - unboxed literal -unboxed-let-functions4.rkt line 31 col 6 - + - unboxed binary float complex -unboxed-let-functions4.rkt line 30 col 3 - f - unboxed call site -unboxed-let-functions4.rkt line 30 col 3 - f - call to fun with unboxed args +unboxed-let-functions4.rkt 29:21 x -- unbox float-complex +unboxed-let-functions4.rkt 29:23 y -- float-coerce-expr in complex ops +unboxed-let-functions4.rkt 29:19 + -- unboxed binary float complex +unboxed-let-functions4.rkt 29:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions4.rkt 28:32 x -- unboxed var -> table +unboxed-let-functions4.rkt 28:7 f -- unboxed function -> table +unboxed-let-functions4.rkt 28:7 f -- fun -> unboxed fun +unboxed-let-functions4.rkt 29:21 x -- leave var unboxed +unboxed-let-functions4.rkt 29:23 y -- float-coerce-expr in complex ops +unboxed-let-functions4.rkt 29:19 + -- unboxed binary float complex +unboxed-let-functions4.rkt 29:18 (#%app + x y) -- unboxed float complex +unboxed-let-functions4.rkt 31:8 1.0+2.0i -- unboxed literal +unboxed-let-functions4.rkt 31:17 2.0+4.0i -- unboxed literal +unboxed-let-functions4.rkt 31:6 + -- unboxed binary float complex +unboxed-let-functions4.rkt 30:3 f -- unboxed call site +unboxed-let-functions4.rkt 30:3 f -- call to fun with unboxed args 6.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt index 9cc06c17..f9b2df93 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt @@ -1,9 +1,9 @@ #; ( -unboxed-let-functions5.rkt line 20 col 15 - 1.0+2.0i - unboxed literal -unboxed-let-functions5.rkt line 20 col 24 - 2.0+4.0i - unboxed literal -unboxed-let-functions5.rkt line 20 col 13 - + - unboxed binary float complex -unboxed-let-functions5.rkt line 20 col 12 - (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) - unboxed float complex +unboxed-let-functions5.rkt 20:15 1.0+2.0i -- unboxed literal +unboxed-let-functions5.rkt 20:24 2.0+4.0i -- unboxed literal +unboxed-let-functions5.rkt 20:13 + -- unboxed binary float complex +unboxed-let-functions5.rkt 20:12 (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)) -- unboxed float complex 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt index 397416ce..9d8b003f 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt @@ -1,26 +1,26 @@ #; ( -unboxed-let-functions6.rkt line 35 col 13 - z - unbox float-complex -unboxed-let-functions6.rkt line 35 col 15 - 0.0+1.0i - unboxed literal -unboxed-let-functions6.rkt line 35 col 11 - + - unboxed binary float complex -unboxed-let-functions6.rkt line 35 col 10 - (#%app + z (quote 0.0+1.0i)) - unboxed float complex -unboxed-let-functions6.rkt line 32 col 31 - z - unboxed var -> table -unboxed-let-functions6.rkt line 32 col 6 - loop - unboxed function -> table -unboxed-let-functions6.rkt line 32 col 6 - loop - fun -> unboxed fun -unboxed-let-functions6.rkt line 35 col 13 - z - leave var unboxed -unboxed-let-functions6.rkt line 35 col 15 - 0.0+1.0i - unboxed literal -unboxed-let-functions6.rkt line 35 col 11 - + - unboxed binary float complex -unboxed-let-functions6.rkt line 35 col 10 - (#%app + z (quote 0.0+1.0i)) - unboxed float complex -unboxed-let-functions6.rkt line 36 col 19 - z - leave var unboxed -unboxed-let-functions6.rkt line 36 col 22 - car - pair -unboxed-let-functions6.rkt line 36 col 21 - (#%app car l) - float-coerce-expr in complex ops -unboxed-let-functions6.rkt line 36 col 17 - + - unboxed binary float complex -unboxed-let-functions6.rkt line 36 col 11 - loop - unboxed call site -unboxed-let-functions6.rkt line 37 col 17 - cdr - pair -unboxed-let-functions6.rkt line 36 col 11 - loop - call to fun with unboxed args -unboxed-let-functions6.rkt line 32 col 51 - 0.0+0.0i - unboxed literal -#f line #f col #f - (letrec-values (((loop) (lambda (z l) (if (#%app null? l) (#%app + z (quote 0.0+1.0i)) (#%app loop (#%app + z (#%app car l)) (#%app cdr l)))))) loop) - unboxed call site -unboxed-let-functions6.rkt line 32 col 6 - loop - unboxed let loop +unboxed-let-functions6.rkt 35:13 z -- unbox float-complex +unboxed-let-functions6.rkt 35:15 0.0+1.0i -- unboxed literal +unboxed-let-functions6.rkt 35:11 + -- unboxed binary float complex +unboxed-let-functions6.rkt 35:10 (#%app + z (quote 0.0+1.0i)) -- unboxed float complex +unboxed-let-functions6.rkt 32:31 z -- unboxed var -> table +unboxed-let-functions6.rkt 32:6 loop -- unboxed function -> table +unboxed-let-functions6.rkt 32:6 loop -- fun -> unboxed fun +unboxed-let-functions6.rkt 35:13 z -- leave var unboxed +unboxed-let-functions6.rkt 35:15 0.0+1.0i -- unboxed literal +unboxed-let-functions6.rkt 35:11 + -- unboxed binary float complex +unboxed-let-functions6.rkt 35:10 (#%app + z (quote 0.0+1.0i)) -- unboxed float complex +unboxed-let-functions6.rkt 36:19 z -- leave var unboxed +unboxed-let-functions6.rkt 36:22 car -- pair +unboxed-let-functions6.rkt 36:21 (#%app car l) -- float-coerce-expr in complex ops +unboxed-let-functions6.rkt 36:17 + -- unboxed binary float complex +unboxed-let-functions6.rkt 36:11 loop -- unboxed call site +unboxed-let-functions6.rkt 37:17 cdr -- pair +unboxed-let-functions6.rkt 36:11 loop -- call to fun with unboxed args +unboxed-let-functions6.rkt 32:51 0.0+0.0i -- unboxed literal +#f (no location) (letrec-values (((loop) (lambda (z l) (if (#%app null? l) (#%app + z (quote 0.0+1.0i)) (#%app loop (#%app + z (#%app car l)) (#%app cdr l)))))) loop) -- unboxed call site +unboxed-let-functions6.rkt 32:6 loop -- unboxed let loop 6.0+1.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt index f04d6edf..03fa119e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt @@ -1,24 +1,24 @@ #; ( -unboxed-let-functions7.rkt line 34 col 15 - z - unbox float-complex -unboxed-let-functions7.rkt line 34 col 18 - car - pair -unboxed-let-functions7.rkt line 34 col 17 - (#%app car l) - float-coerce-expr in complex ops -unboxed-let-functions7.rkt line 34 col 13 - + - unboxed binary float complex -unboxed-let-functions7.rkt line 34 col 12 - (#%app + z (#%app car l)) - unboxed float complex -unboxed-let-functions7.rkt line 30 col 31 - z - unboxed var -> table -unboxed-let-functions7.rkt line 30 col 6 - loop - unboxed function -> table -unboxed-let-functions7.rkt line 30 col 6 - loop - fun -> unboxed fun -unboxed-let-functions7.rkt line 33 col 6 - z - unboxed complex variable -unboxed-let-functions7.rkt line 34 col 15 - z - leave var unboxed -unboxed-let-functions7.rkt line 34 col 18 - car - pair -unboxed-let-functions7.rkt line 34 col 17 - (#%app car l) - float-coerce-expr in complex ops -unboxed-let-functions7.rkt line 34 col 13 - + - unboxed binary float complex -unboxed-let-functions7.rkt line 34 col 7 - loop - unboxed call site -unboxed-let-functions7.rkt line 35 col 13 - cdr - pair -unboxed-let-functions7.rkt line 34 col 7 - loop - call to fun with unboxed args -unboxed-let-functions7.rkt line 30 col 51 - 0.0+0.0i - unboxed literal -#f line #f col #f - (letrec-values (((loop) (lambda (z l) (if (#%app null? l) z (#%app loop (#%app + z (#%app car l)) (#%app cdr l)))))) loop) - unboxed call site -unboxed-let-functions7.rkt line 30 col 6 - loop - unboxed let loop +unboxed-let-functions7.rkt 34:15 z -- unbox float-complex +unboxed-let-functions7.rkt 34:18 car -- pair +unboxed-let-functions7.rkt 34:17 (#%app car l) -- float-coerce-expr in complex ops +unboxed-let-functions7.rkt 34:13 + -- unboxed binary float complex +unboxed-let-functions7.rkt 34:12 (#%app + z (#%app car l)) -- unboxed float complex +unboxed-let-functions7.rkt 30:31 z -- unboxed var -> table +unboxed-let-functions7.rkt 30:6 loop -- unboxed function -> table +unboxed-let-functions7.rkt 30:6 loop -- fun -> unboxed fun +unboxed-let-functions7.rkt 33:6 z -- unboxed complex variable +unboxed-let-functions7.rkt 34:15 z -- leave var unboxed +unboxed-let-functions7.rkt 34:18 car -- pair +unboxed-let-functions7.rkt 34:17 (#%app car l) -- float-coerce-expr in complex ops +unboxed-let-functions7.rkt 34:13 + -- unboxed binary float complex +unboxed-let-functions7.rkt 34:7 loop -- unboxed call site +unboxed-let-functions7.rkt 35:13 cdr -- pair +unboxed-let-functions7.rkt 34:7 loop -- call to fun with unboxed args +unboxed-let-functions7.rkt 30:51 0.0+0.0i -- unboxed literal +#f (no location) (letrec-values (((loop) (lambda (z l) (if (#%app null? l) z (#%app loop (#%app + z (#%app car l)) (#%app cdr l)))))) loop) -- unboxed call site +unboxed-let-functions7.rkt 30:6 loop -- unboxed let loop 6.0+0.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt index 8943e272..7fcad685 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt @@ -1,9 +1,9 @@ #; ( -unboxed-let-functions8.rkt line 15 col 67 - x - unbox float-complex -unboxed-let-functions8.rkt line 15 col 69 - 2.0+4.0i - unboxed literal -unboxed-let-functions8.rkt line 15 col 65 - + - unboxed binary float complex -unboxed-let-functions8.rkt line 15 col 64 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex +unboxed-let-functions8.rkt 15:67 x -- unbox float-complex +unboxed-let-functions8.rkt 15:69 2.0+4.0i -- unboxed literal +unboxed-let-functions8.rkt 15:65 + -- unboxed binary float complex +unboxed-let-functions8.rkt 15:64 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt index 47eb328a..d0e2ea38 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt @@ -1,31 +1,31 @@ #; ( -unboxed-let.rkt line 38 col 14 - t1 - unbox float-complex -unboxed-let.rkt line 38 col 17 - 3.0+6.0i - unboxed literal -unboxed-let.rkt line 38 col 12 - - - unboxed binary float complex -unboxed-let.rkt line 38 col 11 - (#%app - t1 (quote 3.0+6.0i)) - unboxed float complex -unboxed-let.rkt line 37 col 14 - 1.0+2.0i - unboxed literal -unboxed-let.rkt line 37 col 23 - 2.0+4.0i - unboxed literal -unboxed-let.rkt line 37 col 12 - + - unboxed binary float complex -unboxed-let.rkt line 37 col 0 - (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (let-values (((t2) (#%app - t1 (quote 3.0+6.0i)))) (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3)))) - unboxed let bindings -unboxed-let.rkt line 40 col 5 - t2 - unbox float-complex -unboxed-let.rkt line 40 col 8 - t3 - unbox float-complex -unboxed-let.rkt line 40 col 3 - + - unboxed binary float complex -unboxed-let.rkt line 40 col 2 - (#%app + t2 t3) - unboxed float complex -unboxed-let.rkt line 38 col 14 - t1 - leave var unboxed -unboxed-let.rkt line 38 col 17 - 3.0+6.0i - unboxed literal -unboxed-let.rkt line 38 col 12 - - - unboxed binary float complex -unboxed-let.rkt line 37 col 0 - (let-values (((t2) (#%app - t1 (quote 3.0+6.0i)))) (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3))) - unboxed let bindings -unboxed-let.rkt line 40 col 5 - t2 - leave var unboxed -unboxed-let.rkt line 40 col 8 - t3 - unbox float-complex -unboxed-let.rkt line 40 col 3 - + - unboxed binary float complex -unboxed-let.rkt line 40 col 2 - (#%app + t2 t3) - unboxed float complex -unboxed-let.rkt line 39 col 11 - 4.0+8.0i - unboxed literal -unboxed-let.rkt line 37 col 0 - (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3)) - unboxed let bindings -unboxed-let.rkt line 40 col 5 - t2 - leave var unboxed -unboxed-let.rkt line 40 col 8 - t3 - leave var unboxed -unboxed-let.rkt line 40 col 3 - + - unboxed binary float complex -unboxed-let.rkt line 40 col 2 - (#%app + t2 t3) - unboxed float complex +unboxed-let.rkt 38:14 t1 -- unbox float-complex +unboxed-let.rkt 38:17 3.0+6.0i -- unboxed literal +unboxed-let.rkt 38:12 - -- unboxed binary float complex +unboxed-let.rkt 38:11 (#%app - t1 (quote 3.0+6.0i)) -- unboxed float complex +unboxed-let.rkt 37:14 1.0+2.0i -- unboxed literal +unboxed-let.rkt 37:23 2.0+4.0i -- unboxed literal +unboxed-let.rkt 37:12 + -- unboxed binary float complex +unboxed-let.rkt 37:0 (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (let-values (((t2) (#%app - t1 (quote 3.0+6.0i)))) (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3)))) -- unboxed let bindings +unboxed-let.rkt 40:5 t2 -- unbox float-complex +unboxed-let.rkt 40:8 t3 -- unbox float-complex +unboxed-let.rkt 40:3 + -- unboxed binary float complex +unboxed-let.rkt 40:2 (#%app + t2 t3) -- unboxed float complex +unboxed-let.rkt 38:14 t1 -- leave var unboxed +unboxed-let.rkt 38:17 3.0+6.0i -- unboxed literal +unboxed-let.rkt 38:12 - -- unboxed binary float complex +unboxed-let.rkt 37:0 (let-values (((t2) (#%app - t1 (quote 3.0+6.0i)))) (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3))) -- unboxed let bindings +unboxed-let.rkt 40:5 t2 -- leave var unboxed +unboxed-let.rkt 40:8 t3 -- unbox float-complex +unboxed-let.rkt 40:3 + -- unboxed binary float complex +unboxed-let.rkt 40:2 (#%app + t2 t3) -- unboxed float complex +unboxed-let.rkt 39:11 4.0+8.0i -- unboxed literal +unboxed-let.rkt 37:0 (let-values (((t3) (quote 4.0+8.0i))) (#%app + t2 t3)) -- unboxed let bindings +unboxed-let.rkt 40:5 t2 -- leave var unboxed +unboxed-let.rkt 40:8 t3 -- leave var unboxed +unboxed-let.rkt 40:3 + -- unboxed binary float complex +unboxed-let.rkt 40:2 (#%app + t2 t3) -- unboxed float complex 4.0+8.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt index 55f51c6b..162123d0 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt @@ -1,24 +1,24 @@ #; ( -unboxed-let2.rkt line 32 col 5 - t1 - unbox float-complex -unboxed-let2.rkt line 32 col 8 - t2 - unbox float-complex -unboxed-let2.rkt line 32 col 3 - + - unboxed binary float complex -unboxed-let2.rkt line 32 col 2 - (#%app + t1 t2) - unboxed float complex -unboxed-let2.rkt line 32 col 5 - t1 - unbox float-complex -unboxed-let2.rkt line 32 col 8 - t2 - unbox float-complex -unboxed-let2.rkt line 32 col 3 - + - unboxed binary float complex -unboxed-let2.rkt line 32 col 2 - (#%app + t1 t2) - unboxed float complex -unboxed-let2.rkt line 30 col 13 - 1.0+2.0i - unboxed literal -unboxed-let2.rkt line 30 col 22 - 2.0+4.0i - unboxed literal -unboxed-let2.rkt line 30 col 11 - + - unboxed binary float complex -unboxed-let2.rkt line 31 col 13 - 3.0+6.0i - unboxed literal -unboxed-let2.rkt line 31 col 22 - 4.0+8.0i - unboxed literal -unboxed-let2.rkt line 31 col 11 - + - unboxed binary float complex -unboxed-let2.rkt line 30 col 0 - (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) ((t2) (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)))) (#%app + t1 t2)) - unboxed let bindings -unboxed-let2.rkt line 32 col 5 - t1 - leave var unboxed -unboxed-let2.rkt line 32 col 8 - t2 - leave var unboxed -unboxed-let2.rkt line 32 col 3 - + - unboxed binary float complex -unboxed-let2.rkt line 32 col 2 - (#%app + t1 t2) - unboxed float complex +unboxed-let2.rkt 32:5 t1 -- unbox float-complex +unboxed-let2.rkt 32:8 t2 -- unbox float-complex +unboxed-let2.rkt 32:3 + -- unboxed binary float complex +unboxed-let2.rkt 32:2 (#%app + t1 t2) -- unboxed float complex +unboxed-let2.rkt 32:5 t1 -- unbox float-complex +unboxed-let2.rkt 32:8 t2 -- unbox float-complex +unboxed-let2.rkt 32:3 + -- unboxed binary float complex +unboxed-let2.rkt 32:2 (#%app + t1 t2) -- unboxed float complex +unboxed-let2.rkt 30:13 1.0+2.0i -- unboxed literal +unboxed-let2.rkt 30:22 2.0+4.0i -- unboxed literal +unboxed-let2.rkt 30:11 + -- unboxed binary float complex +unboxed-let2.rkt 31:13 3.0+6.0i -- unboxed literal +unboxed-let2.rkt 31:22 4.0+8.0i -- unboxed literal +unboxed-let2.rkt 31:11 + -- unboxed binary float complex +unboxed-let2.rkt 30:0 (let-values (((t1) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i))) ((t2) (#%app + (quote 3.0+6.0i) (quote 4.0+8.0i)))) (#%app + t1 t2)) -- unboxed let bindings +unboxed-let2.rkt 32:5 t1 -- leave var unboxed +unboxed-let2.rkt 32:8 t2 -- leave var unboxed +unboxed-let2.rkt 32:3 + -- unboxed binary float complex +unboxed-let2.rkt 32:2 (#%app + t1 t2) -- unboxed float complex 10.0+20.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt index d323037d..a107c146 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt @@ -1,18 +1,18 @@ #; ( -unboxed-let3.rkt line 34 col 9 - x - unbox float-complex -unboxed-let3.rkt line 34 col 11 - 2.0+4.0i - unboxed literal -unboxed-let3.rkt line 34 col 7 - + - unboxed binary float complex -unboxed-let3.rkt line 34 col 6 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex -unboxed-let3.rkt line 31 col 12 - 1.0+2.0i - unboxed literal -unboxed-let3.rkt line 31 col 21 - 2.0+4.0i - unboxed literal -unboxed-let3.rkt line 31 col 10 - + - unboxed binary float complex -unboxed-let3.rkt line 31 col 0 - (let-values (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (if (#%app even? (quote 2)) x (#%app + x (quote 2.0+4.0i)))) - unboxed let bindings -unboxed-let3.rkt line 33 col 6 - x - unboxed complex variable -unboxed-let3.rkt line 34 col 9 - x - leave var unboxed -unboxed-let3.rkt line 34 col 11 - 2.0+4.0i - unboxed literal -unboxed-let3.rkt line 34 col 7 - + - unboxed binary float complex -unboxed-let3.rkt line 34 col 6 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex +unboxed-let3.rkt 34:9 x -- unbox float-complex +unboxed-let3.rkt 34:11 2.0+4.0i -- unboxed literal +unboxed-let3.rkt 34:7 + -- unboxed binary float complex +unboxed-let3.rkt 34:6 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex +unboxed-let3.rkt 31:12 1.0+2.0i -- unboxed literal +unboxed-let3.rkt 31:21 2.0+4.0i -- unboxed literal +unboxed-let3.rkt 31:10 + -- unboxed binary float complex +unboxed-let3.rkt 31:0 (let-values (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (if (#%app even? (quote 2)) x (#%app + x (quote 2.0+4.0i)))) -- unboxed let bindings +unboxed-let3.rkt 33:6 x -- unboxed complex variable +unboxed-let3.rkt 34:9 x -- leave var unboxed +unboxed-let3.rkt 34:11 2.0+4.0i -- unboxed literal +unboxed-let3.rkt 34:7 + -- unboxed binary float complex +unboxed-let3.rkt 34:6 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt index 582ee688..2519447e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt @@ -1,17 +1,17 @@ #; ( -unboxed-letrec-syntaxes+values.rkt line 25 col 27 - x - unbox float-complex -unboxed-letrec-syntaxes+values.rkt line 25 col 29 - 2.0+4.0i - unboxed literal -unboxed-letrec-syntaxes+values.rkt line 25 col 25 - + - unboxed binary float complex -unboxed-letrec-syntaxes+values.rkt line 25 col 24 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex -unboxed-letrec-syntaxes+values.rkt line 24 col 33 - 1.0+2.0i - unboxed literal -unboxed-letrec-syntaxes+values.rkt line 24 col 42 - 2.0+4.0i - unboxed literal -unboxed-letrec-syntaxes+values.rkt line 24 col 31 - + - unboxed binary float complex -unboxed-letrec-syntaxes+values.rkt line 23 col 0 - (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (#%app + x (quote 2.0+4.0i))) - unboxed let bindings -unboxed-letrec-syntaxes+values.rkt line 25 col 27 - x - leave var unboxed -unboxed-letrec-syntaxes+values.rkt line 25 col 29 - 2.0+4.0i - unboxed literal -unboxed-letrec-syntaxes+values.rkt line 25 col 25 - + - unboxed binary float complex -unboxed-letrec-syntaxes+values.rkt line 25 col 24 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex +unboxed-letrec-syntaxes+values.rkt 25:27 x -- unbox float-complex +unboxed-letrec-syntaxes+values.rkt 25:29 2.0+4.0i -- unboxed literal +unboxed-letrec-syntaxes+values.rkt 25:25 + -- unboxed binary float complex +unboxed-letrec-syntaxes+values.rkt 25:24 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex +unboxed-letrec-syntaxes+values.rkt 24:33 1.0+2.0i -- unboxed literal +unboxed-letrec-syntaxes+values.rkt 24:42 2.0+4.0i -- unboxed literal +unboxed-letrec-syntaxes+values.rkt 24:31 + -- unboxed binary float complex +unboxed-letrec-syntaxes+values.rkt 23:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (#%app + (quote 1.0+2.0i) (quote 2.0+4.0i)))) (#%app + x (quote 2.0+4.0i))) -- unboxed let bindings +unboxed-letrec-syntaxes+values.rkt 25:27 x -- leave var unboxed +unboxed-letrec-syntaxes+values.rkt 25:29 2.0+4.0i -- unboxed literal +unboxed-letrec-syntaxes+values.rkt 25:25 + -- unboxed binary float complex +unboxed-letrec-syntaxes+values.rkt 25:24 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex 5.0+10.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt index 022f5a58..2641c3c9 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt @@ -1,22 +1,22 @@ #; ( -unboxed-letrec.rkt line 31 col 5 - x - unbox float-complex -unboxed-letrec.rkt line 31 col 7 - y - unbox float-complex -unboxed-letrec.rkt line 31 col 3 - + - unboxed binary float complex -unboxed-letrec.rkt line 31 col 2 - (#%app + x y) - unboxed float complex -unboxed-letrec.rkt line 31 col 5 - x - unbox float-complex -unboxed-letrec.rkt line 31 col 7 - y - unbox float-complex -unboxed-letrec.rkt line 31 col 3 - + - unboxed binary float complex -unboxed-letrec.rkt line 31 col 2 - (#%app + x y) - unboxed float complex -unboxed-letrec.rkt line 29 col 31 - 1.0+2.0i - unboxed literal -unboxed-letrec.rkt line 30 col 34 - 2.0+4.0i - unboxed literal -unboxed-letrec.rkt line 30 col 43 - 3.0+6.0i - unboxed literal -unboxed-letrec.rkt line 30 col 32 - + - unboxed binary float complex -unboxed-letrec.rkt line 28 col 0 - (letrec-values (((f) (lambda (x) (#%app f x))) ((x) (quote 1.0+2.0i)) ((y) (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) (#%app + x y)) - unboxed let bindings -unboxed-letrec.rkt line 31 col 5 - x - leave var unboxed -unboxed-letrec.rkt line 31 col 7 - y - leave var unboxed -unboxed-letrec.rkt line 31 col 3 - + - unboxed binary float complex -unboxed-letrec.rkt line 31 col 2 - (#%app + x y) - unboxed float complex +unboxed-letrec.rkt 31:5 x -- unbox float-complex +unboxed-letrec.rkt 31:7 y -- unbox float-complex +unboxed-letrec.rkt 31:3 + -- unboxed binary float complex +unboxed-letrec.rkt 31:2 (#%app + x y) -- unboxed float complex +unboxed-letrec.rkt 31:5 x -- unbox float-complex +unboxed-letrec.rkt 31:7 y -- unbox float-complex +unboxed-letrec.rkt 31:3 + -- unboxed binary float complex +unboxed-letrec.rkt 31:2 (#%app + x y) -- unboxed float complex +unboxed-letrec.rkt 29:31 1.0+2.0i -- unboxed literal +unboxed-letrec.rkt 30:34 2.0+4.0i -- unboxed literal +unboxed-letrec.rkt 30:43 3.0+6.0i -- unboxed literal +unboxed-letrec.rkt 30:32 + -- unboxed binary float complex +unboxed-letrec.rkt 28:0 (letrec-values (((f) (lambda (x) (#%app f x))) ((x) (quote 1.0+2.0i)) ((y) (#%app + (quote 2.0+4.0i) (quote 3.0+6.0i)))) (#%app + x y)) -- unboxed let bindings +unboxed-letrec.rkt 31:5 x -- leave var unboxed +unboxed-letrec.rkt 31:7 y -- leave var unboxed +unboxed-letrec.rkt 31:3 + -- unboxed binary float complex +unboxed-letrec.rkt 31:2 (#%app + x y) -- unboxed float complex 6.0+12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt index 344a6519..988a669d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt @@ -1,25 +1,25 @@ #; ( -unboxed-make-rectangular.rkt line 33 col 5 - x - unbox float-complex -unboxed-make-rectangular.rkt line 33 col 7 - 2.0+4.0i - unboxed literal -unboxed-make-rectangular.rkt line 33 col 3 - + - unboxed binary float complex -unboxed-make-rectangular.rkt line 33 col 2 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex -unboxed-make-rectangular.rkt line 32 col 10 - make-rectangular - make-rectangular elimination -unboxed-make-rectangular.rkt line 32 col 0 - (let-values (((x) (#%app make-rectangular (quote 1.0) (quote 2.0)))) (#%app + x (quote 2.0+4.0i))) - unboxed let bindings -unboxed-make-rectangular.rkt line 33 col 5 - x - leave var unboxed -unboxed-make-rectangular.rkt line 33 col 7 - 2.0+4.0i - unboxed literal -unboxed-make-rectangular.rkt line 33 col 3 - + - unboxed binary float complex -unboxed-make-rectangular.rkt line 33 col 2 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex -unboxed-make-rectangular.rkt line 35 col 5 - x - unbox float-complex -unboxed-make-rectangular.rkt line 35 col 7 - 2.0+4.0i - unboxed literal -unboxed-make-rectangular.rkt line 35 col 3 - + - unboxed binary float complex -unboxed-make-rectangular.rkt line 35 col 2 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex -unboxed-make-rectangular.rkt line 34 col 10 - unsafe-make-flrectangular - make-rectangular elimination -unboxed-make-rectangular.rkt line 34 col 0 - (let-values (((x) (#%app unsafe-make-flrectangular (quote 1.0) (quote 2.0)))) (#%app + x (quote 2.0+4.0i))) - unboxed let bindings -unboxed-make-rectangular.rkt line 35 col 5 - x - leave var unboxed -unboxed-make-rectangular.rkt line 35 col 7 - 2.0+4.0i - unboxed literal -unboxed-make-rectangular.rkt line 35 col 3 - + - unboxed binary float complex -unboxed-make-rectangular.rkt line 35 col 2 - (#%app + x (quote 2.0+4.0i)) - unboxed float complex +unboxed-make-rectangular.rkt 33:5 x -- unbox float-complex +unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal +unboxed-make-rectangular.rkt 33:3 + -- unboxed binary float complex +unboxed-make-rectangular.rkt 33:2 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex +unboxed-make-rectangular.rkt 32:10 make-rectangular -- make-rectangular elimination +unboxed-make-rectangular.rkt 32:0 (let-values (((x) (#%app make-rectangular (quote 1.0) (quote 2.0)))) (#%app + x (quote 2.0+4.0i))) -- unboxed let bindings +unboxed-make-rectangular.rkt 33:5 x -- leave var unboxed +unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal +unboxed-make-rectangular.rkt 33:3 + -- unboxed binary float complex +unboxed-make-rectangular.rkt 33:2 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex +unboxed-make-rectangular.rkt 35:5 x -- unbox float-complex +unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal +unboxed-make-rectangular.rkt 35:3 + -- unboxed binary float complex +unboxed-make-rectangular.rkt 35:2 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex +unboxed-make-rectangular.rkt 34:10 unsafe-make-flrectangular -- make-rectangular elimination +unboxed-make-rectangular.rkt 34:0 (let-values (((x) (#%app unsafe-make-flrectangular (quote 1.0) (quote 2.0)))) (#%app + x (quote 2.0+4.0i))) -- unboxed let bindings +unboxed-make-rectangular.rkt 35:5 x -- leave var unboxed +unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal +unboxed-make-rectangular.rkt 35:3 + -- unboxed binary float complex +unboxed-make-rectangular.rkt 35:2 (#%app + x (quote 2.0+4.0i)) -- unboxed float complex 3.0+6.0i 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt index c616eaf8..6d092dc7 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt @@ -1,7 +1,7 @@ #; ( -vector-length-nested.rkt line 11 col 1 - vector-length - vector-length -vector-length-nested.rkt line 12 col 2 - vector-ref - vector +vector-length-nested.rkt 11:1 vector-length -- vector-length +vector-length-nested.rkt 12:2 vector-ref -- vector 2 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-length.rkt index c045caa4..42b8ef70 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-length.rkt @@ -1,6 +1,6 @@ #; ( -vector-length.rkt line 10 col 1 - vector-length - vector-length +vector-length.rkt 10:1 vector-length -- vector-length 3 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt index 02f1a5d3..1d1a2ce8 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt @@ -1,8 +1,8 @@ #; ( -vector-ref-set-ref.rkt line 15 col 1 - vector-ref - vector -vector-ref-set-ref.rkt line 16 col 1 - vector-set! - vector -vector-ref-set-ref.rkt line 17 col 1 - vector-ref - vector +vector-ref-set-ref.rkt 15:1 vector-ref -- vector +vector-ref-set-ref.rkt 16:1 vector-set! -- vector +vector-ref-set-ref.rkt 17:1 vector-ref -- vector 1 "2" ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt index 68a08817..72569033 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt @@ -1,6 +1,6 @@ #; ( -vector-ref.rkt line 10 col 1 - vector-ref - vector +vector-ref.rkt 10:1 vector-ref -- vector 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt index d98f6174..b0f67da1 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt @@ -1,6 +1,6 @@ #; ( -vector-ref2.rkt line 10 col 1 - vector-ref - vector +vector-ref2.rkt 10:1 vector-ref -- vector 1 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt index 53c29712..9a6a8345 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt @@ -1,6 +1,6 @@ #; ( -vector-set-quote.rkt line 9 col 1 - vector-set! - vector +vector-set-quote.rkt 9:1 vector-set! -- vector ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-set.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set.rkt index 92af9b8a..7ebdb241 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-set.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-set.rkt @@ -1,6 +1,6 @@ #; ( -vector-set.rkt line 9 col 1 - vector-set! - vector +vector-set.rkt 9:1 vector-set! -- vector ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt index 83e5a1f1..b02d5961 100644 --- a/collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt @@ -1,6 +1,6 @@ #; ( -vector-set2.rkt line 9 col 1 - vector-set! - vector +vector-set2.rkt 9:1 vector-set! -- vector ) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/zero.rkt b/collects/tests/typed-scheme/optimizer/tests/zero.rkt index 81eee79c..2e501e34 100644 --- a/collects/tests/typed-scheme/optimizer/tests/zero.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/zero.rkt @@ -1,8 +1,8 @@ #; ( -zero.rkt line 13 col 1 - zero? - fixnum zero? -zero.rkt line 14 col 8 - sqrt - unary float -zero.rkt line 14 col 1 - zero? - float zero? +zero.rkt 13:1 zero? -- fixnum zero? +zero.rkt 14:8 sqrt -- unary float +zero.rkt 14:1 zero? -- float zero? #f #f ) diff --git a/collects/typed-scheme/optimizer/utils.rkt b/collects/typed-scheme/optimizer/utils.rkt index a037dfbb..7ed68bcb 100644 --- a/collects/typed-scheme/optimizer/utils.rkt +++ b/collects/typed-scheme/optimizer/utils.rkt @@ -23,10 +23,17 @@ (define *log-file* "opt-log") (define *log-to-log-file?* #f) ; otherwise, goes to stdout +(define (line+col->string stx) + (let ([line (syntax-line stx)] + [col (syntax-column stx)]) + (if (and line col) + (format "~a:~a" line col) + "(no location)"))) + (define (do-logging msg stx) - (printf "~a line ~a col ~a - ~a - ~a\n" + (printf "~a ~a ~a -- ~a\n" (syntax-source-file-name stx) - (syntax-line stx) (syntax-column stx) + (line+col->string stx) (syntax->datum stx) msg)) @@ -43,10 +50,9 @@ (define (log-close-call kind stx [irritant #f]) (when *log-close-calls?* (do-logging (if irritant - (format "~a - caused by: ~a - ~a - ~a - ~a" + (format "~a -- caused by: ~a ~a" kind - (syntax-source-file-name irritant) - (syntax-line irritant) (syntax-column irritant) + (line+col->string irritant) (syntax->datum irritant)) kind) stx)))