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

Fixnums and integers can now be coerced for complex operations.

Browse Source
This commit is contained in:
Vincent St-Amour 2010-07-14 10:24:14 -04:00
parent c645aa7ebc
commit 443d8b9f91
8 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang typed/scheme #:optimize
(require racket/unsafe/ops)
(+ 2 1.0+2.0i 3.0+6.0i)

3
collects/tests/typed-scheme/optimizer/generic/inexact-complex-integer.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang typed/scheme #:optimize
(require racket/unsafe/ops racket/flonum)
(+ (expt 2 100) 1.0+2.0i)

13
collects/tests/typed-scheme/optimizer/hand-optimized/inexact-complex-fixnum.rkt Normal file
View File

@ -0,0 +1,13 @@
#lang typed/scheme #:optimize
(require racket/unsafe/ops)
(let* ((unboxed-gensym-1 (unsafe-fx->fl 2))
(unboxed-gensym-2 1.0+2.0i)
(unboxed-gensym-3 (unsafe-flreal-part unboxed-gensym-2))
(unboxed-gensym-4 (unsafe-flimag-part unboxed-gensym-2))
(unboxed-gensym-5 3.0+6.0i)
(unboxed-gensym-6 (unsafe-flreal-part unboxed-gensym-5))
(unboxed-gensym-7 (unsafe-flimag-part unboxed-gensym-5))
(unboxed-gensym-8 (unsafe-fl+ (unsafe-fl+ unboxed-gensym-1 unboxed-gensym-3)
unboxed-gensym-6))
(unboxed-gensym-9 (unsafe-fl+ unboxed-gensym-4 unboxed-gensym-7)))
(unsafe-make-flrectangular unboxed-gensym-8 unboxed-gensym-9))

9
collects/tests/typed-scheme/optimizer/hand-optimized/inexact-complex-integer.rkt Normal file
View File

@ -0,0 +1,9 @@
#lang typed/scheme #:optimize
(require racket/unsafe/ops racket/flonum)
(let* ((unboxed-gensym-1 (->fl (expt 2 100)))
(unboxed-gensym-2 1.0+2.0i)
(unboxed-gensym-3 (unsafe-flreal-part unboxed-gensym-2))
(unboxed-gensym-4 (unsafe-flimag-part unboxed-gensym-2))
(unboxed-gensym-5 (unsafe-fl+ unboxed-gensym-1 unboxed-gensym-3))
(unboxed-gensym-6 unboxed-gensym-4))
(unsafe-make-flrectangular unboxed-gensym-5 unboxed-gensym-6))

3
collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-fixnum.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang typed/scheme
(require racket/unsafe/ops)
(+ 2 1.0+2.0i 3.0+6.0i)

3
collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-integer.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang typed/scheme
(require racket/unsafe/ops racket/flonum)
(+ (expt 2 100) 1.0+2.0i)

2
collects/typed-scheme/optimizer/float.rkt
View File

@ -7,7 +7,7 @@
(types abbrev type-table utils subtype)
(optimizer utils fixnum))
(provide float-opt-expr)
(provide float-opt-expr float-expr int-expr)
(define (mk-float-tbl generic)

33
collects/typed-scheme/optimizer/inexact-complex.rkt
View File

@ -4,7 +4,7 @@
"../utils/utils.rkt"
(for-template scheme/base scheme/math scheme/flonum scheme/unsafe/ops)
(types abbrev type-table utils subtype)
(optimizer utils))
(optimizer utils float fixnum))
(provide inexact-complex-opt-expr)
@ -161,15 +161,6 @@
#`(#,@(append (syntax->list #'(c.bindings ...))
(list #'(imag-part (unsafe-fl- 0.0 c.imag-part)))))))
(pattern e:expr
;; special handling of inexact reals
#:when (subtypeof? #'e -Flonum)
#:with real-part (unboxed-gensym)
#:with imag-part #f
#:with (bindings ...)
#`((real-part #,((optimize) #'e))))
(pattern e:expr
;; can't work on inexact reals, which are a subtype of inexact
;; complexes, so this has to be equality
#:when (isoftype? #'e -InexactComplex)
#:with e* (unboxed-gensym)
#:with real-part (unboxed-gensym)
@ -177,7 +168,23 @@
#:with (bindings ...)
#`((e* #,((optimize) #'e))
(real-part (unsafe-flreal-part e*))
(imag-part (unsafe-flimag-part e*)))))
(imag-part (unsafe-flimag-part e*))))
;; special handling of reals
(pattern e:float-expr
#:with real-part (unboxed-gensym)
#:with imag-part #f
#:with (bindings ...)
#`((real-part #,((optimize) #'e))))
(pattern e:fixnum-expr
#:with real-part (unboxed-gensym)
#:with imag-part #f
#:with (bindings ...)
#`((real-part (unsafe-fx->fl #,((optimize) #'e)))))
(pattern e:int-expr
#:with real-part (unboxed-gensym)
#:with imag-part #f
#:with (bindings ...)
#`((real-part (->fl #,((optimize) #'e))))))
(define-syntax-class inexact-complex-unary-op
(pattern (~or (~literal real-part) (~literal flreal-part)) #:with unsafe #'unsafe-flreal-part)
@ -188,7 +195,7 @@
(define-syntax-class inexact-complex-expr
(pattern e:expr
#:when (subtypeof? #'e -InexactComplex)
#:when (isoftype? #'e -InexactComplex)
#:with opt ((optimize) #'e)))
(define-syntax-class inexact-complex-opt-expr
@ -196,7 +203,7 @@
#:with opt
(begin (log-optimization "unary inexact complex" #'op)
#'(op.unsafe n.opt)))
(pattern (~and exp (#%plain-app op:inexact-complex-binary-op e:inexact-complex-expr ...))
(pattern (~and exp (#%plain-app op:inexact-complex-binary-op e:expr ...))
#:when (isoftype? #'exp -InexactComplex)
#:with exp*:unboxed-inexact-complex-opt-expr #'exp
#:with opt