From: Chris Hanson Date: Mon, 29 Feb 2016 05:23:15 +0000 (-0800) Subject: Implement exact and inexact as per R7RS. X-Git-Tag: mit-scheme-pucked-9.2.12~261^2~87 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e8340d57639149652147ea9c1aa98f016a34aad4;p=mit-scheme.git Implement exact and inexact as per R7RS. --- diff --git a/doc/ref-manual/lists.texi b/doc/ref-manual/lists.texi index 25021b438..7aeb3a772 100644 --- a/doc/ref-manual/lists.texi +++ b/doc/ref-manual/lists.texi @@ -603,7 +603,7 @@ less than the length of the list. The first element of a list has index @group (list-ref '(a b c d) 2) @result{} c (list-ref '(a b c d) - (inexact->exact (round 1.8))) + (exact (round 1.8))) @result{} c @end group @end example diff --git a/doc/ref-manual/numbers.texi b/doc/ref-manual/numbers.texi index b06c689d8..daa23609d 100644 --- a/doc/ref-manual/numbers.texi +++ b/doc/ref-manual/numbers.texi @@ -104,8 +104,8 @@ exact result, then it may either report the violation of an implementation restriction or it may silently coerce its result to an inexact value. @xref{Implementation restrictions}. -@findex inexact->exact -With the exception of @code{inexact->exact}, the operations described in +@findex exact +With the exception of @code{exact}, the operations described in this section must generally return inexact results when given any inexact arguments. An operation may, however, return an exact result if it can prove that the value of the result is unaffected by the @@ -161,7 +161,7 @@ within the implementation: @group * gcd modulo + imag-part numerator -- inexact->exact quotient +- exact quotient abs lcm rationalize angle magnitude real-part ceiling make-polar remainder @@ -640,7 +640,7 @@ of 0 is defined to be 1. @group (numerator (/ 6 4)) @result{} 3 (denominator (/ 6 4)) @result{} 2 -(denominator (exact->inexact (/ 6 4))) @result{} 2.0 +(denominator (inexact (/ 6 4))) @result{} 2.0 @end group @end example @end deffn @@ -661,8 +661,8 @@ modes required by the @sc{ieee} floating point standard. Note: If the argument to one of these procedures is inexact, then the result will also be inexact. If an exact value is needed, the result -should be passed to the @code{inexact->exact} procedure (or use one of -the procedures below). +should be passed to the @code{exact} procedure (or use one of the +procedures below). @example @group @@ -693,7 +693,7 @@ equivalent @example @group (floor->exact x) -(inexact->exact (floor x)) +(exact (floor x)) @end group @end example @@ -719,8 +719,8 @@ simplest rational of all. @example @group -(rationalize (inexact->exact .3) 1/10) @result{} 1/3 @r{; exact} -(rationalize .3 1/10) @result{} #i1/3 @r{; inexact} +(rationalize (exact .3) 1/10) @result{} 1/3 @r{; exact} +(rationalize .3 1/10) @result{} #i1/3 @r{; inexact} @end group @end example @@ -854,9 +854,26 @@ minus @var{pi} (exclusive) to @var{pi} (inclusive). @code{conjugate} returns the complex conjugate of @var{z}. @end deffn -@deffn procedure exact->inexact z -@deffnx procedure inexact->exact z -@code{exact->inexact} returns an inexact representation of @var{z}. The +The procedures @code{exact} and @code{inexact} implement the natural +one-to-one correspondence between exact and inexact integers +throughout an implementation-dependent range. + +@deffn procedure inexact z +@deffnx procedure exact->inexact z +@code{inexact} returns an inexact representation of @var{z}. The +value returned is the inexact number that is numerically closest to the +argument. If an exact argument has no reasonably close inexact +equivalent, then a violation of an implementation restriction may be +reported; MIT/GNU Scheme signals an error of type +@code{condition-type:bad-range-argument} in this case. +@findex condition-type:bad-range-argument + +The procedure @code{exact->inexact} has been deprecated by @urseven{}. +@end deffn + +@deffn procedure inexact z +@deffnx procedure exact->inexact z +@code{inexact} returns an inexact representation of @var{z}. The value returned is the inexact number that is numerically closest to the argument. If an exact argument has no reasonably close inexact equivalent, then a violation of an implementation restriction may be @@ -864,16 +881,14 @@ reported; MIT/GNU Scheme signals an error of type @code{condition-type:bad-range-argument} in this case. @findex condition-type:bad-range-argument -@code{inexact->exact} returns an exact representation of @var{z}. The -value returned is the exact number that is numerically closest to the +@code{exact} returns an exact representation of @var{z}. The value +returned is the exact number that is numerically closest to the argument. If an inexact argument has no reasonably close exact equivalent, then a violation of an implementation restriction may be -reported; in MIT/GNU Scheme this case does not occur because all inexact -numbers are representable as exact numbers. +reported; in MIT/GNU Scheme this case does not occur because all +inexact numbers are representable as exact numbers. -These procedures implement the natural one-to-one correspondence between -exact and inexact integers throughout an implementation-dependent range. -@xref{Implementation restrictions}. +The procedure @code{inexact->exact} has been deprecated by @urseven{}. @end deffn @node Numerical input and output, Fixnum and Flonum Operations, Numerical operations, Numbers diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg index e603f7ec9..760215ab2 100644 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@ -2928,6 +2928,7 @@ USA. (denominator complex:denominator) (denominator->exact complex:denominator->exact) (even? complex:even?) + (exact complex:inexact->exact) (exact->inexact complex:exact->inexact) (exact-rational? rat:rational?) (exact? complex:exact?) @@ -2936,6 +2937,7 @@ USA. (floor complex:floor) (floor->exact complex:floor->exact) (imag-part complex:imag-part) + (inexact complex:exact->inexact) (inexact->exact complex:inexact->exact) (integer-ceiling complex:integer-ceiling) (integer-divide complex:divide)