nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: export math_f* as math::f* submods and use tailcalls in std::math

Browse Source
This commit is contained in:
Stefan Plantikow 2011-12-08 19:30:57 +01:00 committed by Graydon Hoare
parent 6cdb69cccb
commit 6d0901cb4d
5 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/cmath.rs
View File

@ -23,7 +23,7 @@ native mod f64 {
#[link_name="log1p"] pure fn ln1p(n: f64) -> f64; #[link_name="log1p"] pure fn ln1p(n: f64) -> f64;
pure fn log10(n: f64) -> f64; pure fn log10(n: f64) -> f64;
pure fn log2(n: f64) -> f64; pure fn log2(n: f64) -> f64;
pure fn modf(n: f64, &iptr: f64) -> f64; pure fn modf(n: f64, iptr: *f64) -> f64;
pure fn pow(n: f64, e: f64) -> f64; pure fn pow(n: f64, e: f64) -> f64;
pure fn rint(n: f64) -> f64; pure fn rint(n: f64) -> f64;
pure fn round(n: f64) -> f64; pure fn round(n: f64) -> f64;
@ -58,7 +58,7 @@ native mod f32 {
#[link_name="log1p"] pure fn ln1p(n: f64) -> f64; #[link_name="log1p"] pure fn ln1p(n: f64) -> f64;
#[link_name="log2f"] pure fn log2(n: f32) -> f32; #[link_name="log2f"] pure fn log2(n: f32) -> f32;
#[link_name="log10f"] pure fn log10(n: f32) -> f32; #[link_name="log10f"] pure fn log10(n: f32) -> f32;
#[link_name="modff"] pure fn modf(n: f32, &iptr: f32) -> f32; #[link_name="modff"] pure fn modf(n: f32, iptr: *f32) -> f32;
#[link_name="powf"] pure fn pow(n: f32, e: f32) -> f32; #[link_name="powf"] pure fn pow(n: f32, e: f32) -> f32;
#[link_name="rintf"] pure fn rint(n: f32) -> f32; #[link_name="rintf"] pure fn rint(n: f32) -> f32;
#[link_name="roundf"] pure fn round(n: f32) -> f32; #[link_name="roundf"] pure fn round(n: f32) -> f32;

72
src/libstd/math.rs
View File

@ -16,13 +16,18 @@ export
ldexp, ln, ln1p, log10, log2, modf, rint, round, pow, sin, sinh, sqrt, ldexp, ln, ln1p, log10, log2, modf, rint, round, pow, sin, sinh, sqrt,
tan, tanh, trunc; tan, tanh, trunc;
export f64, f32;
import f64 = math_f64;
import f32 = math_f32;
// These two must match in width according to architecture // These two must match in width according to architecture
import ctypes::m_float; import ctypes::m_float;
import ctypes::c_int; import ctypes::c_int;
import ptr;
import m_float = math_f64; import m_float = math_f64;
// FIXME replace with redirect to m_float::consts::FOO as soon as it works
/* /*
Module: consts Module: consts
*/ */
@ -143,7 +148,7 @@ Function: acos
Returns the arccosine of an angle (measured in rad) Returns the arccosine of an angle (measured in rad)
*/ */
pure fn acos(x: float) -> float pure fn acos(x: float) -> float
{ m_float::acos(x as m_float) as float } { be m_float::acos(x as m_float) as float }
/* /*
Function: asin Function: asin
@ -151,7 +156,7 @@ Function: asin
Returns the arcsine of an angle (measured in rad) Returns the arcsine of an angle (measured in rad)
*/ */
pure fn asin(x: float) -> float pure fn asin(x: float) -> float
{ m_float::asin(x as m_float) as float } { be m_float::asin(x as m_float) as float }
/* /*
Function: atan Function: atan
@ -159,7 +164,7 @@ Function: atan
Returns the arctangents of an angle (measured in rad) Returns the arctangents of an angle (measured in rad)
*/ */
pure fn atan(x: float) -> float pure fn atan(x: float) -> float
{ m_float::atan(x as m_float) as float } { be m_float::atan(x as m_float) as float }
/* /*
@ -168,7 +173,7 @@ Function: atan2
Returns the arctangent of an angle (measured in rad) Returns the arctangent of an angle (measured in rad)
*/ */
pure fn atan2(y: float, x: float) -> float pure fn atan2(y: float, x: float) -> float
{ m_float::atan2(y as m_float, x as m_float) as float } { be m_float::atan2(y as m_float, x as m_float) as float }
/* /*
Function: ceil Function: ceil
@ -176,7 +181,7 @@ Function: ceil
Returns the smallest integral value less than or equal to `n` Returns the smallest integral value less than or equal to `n`
*/ */
pure fn ceil(n: float) -> float pure fn ceil(n: float) -> float
{ m_float::ceil(n as m_float) as float } { be m_float::ceil(n as m_float) as float }
/* /*
Function: cos Function: cos
@ -184,7 +189,7 @@ Function: cos
Returns the cosine of an angle `x` (measured in rad) Returns the cosine of an angle `x` (measured in rad)
*/ */
pure fn cos(x: float) -> float pure fn cos(x: float) -> float
{ m_float::cos(x as m_float) as float } { be m_float::cos(x as m_float) as float }
/* /*
Function: cosh Function: cosh
@ -193,7 +198,7 @@ Returns the hyperbolic cosine of `x`
*/ */
pure fn cosh(x: float) -> float pure fn cosh(x: float) -> float
{ m_float::cosh(x as m_float) as float } { be m_float::cosh(x as m_float) as float }
/* /*
@ -202,7 +207,7 @@ Function: exp
Returns `consts::e` to the power of `n* Returns `consts::e` to the power of `n*
*/ */
pure fn exp(n: float) -> float pure fn exp(n: float) -> float
{ m_float::exp(n as m_float) as float } { be m_float::exp(n as m_float) as float }
/* /*
Function: abs Function: abs
@ -210,7 +215,7 @@ Function: abs
Returns the absolute value of `n` Returns the absolute value of `n`
*/ */
pure fn abs(n: float) -> float pure fn abs(n: float) -> float
{ m_float::abs(n as m_float) as float } { be m_float::abs(n as m_float) as float }
/* /*
Function: floor Function: floor
@ -218,7 +223,7 @@ Function: floor
Returns the largest integral value less than or equal to `n` Returns the largest integral value less than or equal to `n`
*/ */
pure fn floor(n: float) -> float pure fn floor(n: float) -> float
{ m_float::floor(n as m_float) as float } { be m_float::floor(n as m_float) as float }
/* /*
Function: fmod Function: fmod
@ -226,7 +231,7 @@ Function: fmod
Returns the floating-point remainder of `x/y` Returns the floating-point remainder of `x/y`
*/ */
pure fn fmod(x: float, y: float) -> float pure fn fmod(x: float, y: float) -> float
{ m_float::fmod(x as m_float, y as m_float) as float } { be m_float::fmod(x as m_float, y as m_float) as float }
/* /*
Function: ln Function: ln
@ -234,7 +239,7 @@ Function: ln
Returns the natural logaritm of `n` Returns the natural logaritm of `n`
*/ */
pure fn ln(n: float) -> float pure fn ln(n: float) -> float
{ m_float::ln(n as m_float) as float } { be m_float::ln(n as m_float) as float }
/* /*
Function: ldexp Function: ldexp
@ -242,7 +247,7 @@ Function: ldexp
Returns `x` multiplied by 2 to the power of `n` Returns `x` multiplied by 2 to the power of `n`
*/ */
pure fn ldexp(n: float, i: int) -> float pure fn ldexp(n: float, i: int) -> float
{ m_float::ldexp(n as m_float, i as c_int) as float } { be m_float::ldexp(n as m_float, i as c_int) as float }
/* /*
Function: ln1p Function: ln1p
@ -251,7 +256,7 @@ Returns the natural logarithm of `1+n` accurately,
even for very small values of `n` even for very small values of `n`
*/ */
pure fn ln1p(n: float) -> float pure fn ln1p(n: float) -> float
{ m_float::ln1p(n as m_float) as float } { be m_float::ln1p(n as m_float) as float }
/* /*
Function: log10 Function: log10
@ -259,7 +264,7 @@ Function: log10
Returns the logarithm to base 10 of `n` Returns the logarithm to base 10 of `n`
*/ */
pure fn log10(n: float) -> float pure fn log10(n: float) -> float
{ m_float::log10(n as m_float) as float } { be m_float::log10(n as m_float) as float }
/* /*
Function: log2 Function: log2
@ -267,8 +272,7 @@ Function: log2
Returns the logarithm to base 2 of `n` Returns the logarithm to base 2 of `n`
*/ */
pure fn log2(n: float) -> float pure fn log2(n: float) -> float
{ m_float::log2(n as m_float) as float } { be m_float::log2(n as m_float) as float }
/* /*
Function: modf Function: modf
@ -282,14 +286,10 @@ Returns:
The fractional part of `n` The fractional part of `n`
*/ */
pure fn modf(n: float, &iptr: float) -> float { #[no(warn_trivial_casts)] // FIXME Implement
unchecked { pure fn modf(n: float, &iptr: float) -> float { unsafe {
let f = iptr as m_float; be m_float::modf(n as m_float, ptr::addr_of(iptr) as *m_float) as float
let r = m_float::modf(n as m_float, f) as float; } }
iptr = f as float;
ret r;
}
}
/* /*
Function: frexp Function: frexp
@ -306,13 +306,13 @@ Returns:
The fractional part of `n` The fractional part of `n`
*/ */
pure fn frexp(n: float, &exp: c_int) -> float pure fn frexp(n: float, &exp: c_int) -> float
{ m_float::frexp(n as m_float, exp) as float } { be m_float::frexp(n as m_float, exp) as float }
/* /*
Function: pow Function: pow
*/ */
pure fn pow(v: float, e: float) -> float pure fn pow(v: float, e: float) -> float
{ m_float::pow(v as m_float, e as m_float) as float } { be m_float::pow(v as m_float, e as m_float) as float }
/* /*
@ -322,7 +322,7 @@ Returns the integral value nearest to `x` (according to the
prevailing rounding mode) in floating-point format prevailing rounding mode) in floating-point format
*/ */
pure fn rint(x: float) -> float pure fn rint(x: float) -> float
{ m_float::rint(x as m_float) as float } { be m_float::rint(x as m_float) as float }
/* /*
Function: round Function: round
@ -332,7 +332,7 @@ Return the integral value nearest to `x` rounding half-way
cases away from zero, regardless of the current rounding direction. cases away from zero, regardless of the current rounding direction.
*/ */
pure fn round(x: float) -> float pure fn round(x: float) -> float
{ m_float::round(x as m_float) as float } { be m_float::round(x as m_float) as float }
/* /*
Function: sin Function: sin
@ -340,7 +340,7 @@ Function: sin
Returns the sine of an angle `x` (measured in rad) Returns the sine of an angle `x` (measured in rad)
*/ */
pure fn sin(x: float) -> float pure fn sin(x: float) -> float
{ m_float::sin(x as m_float) as float } { be m_float::sin(x as m_float) as float }
/* /*
Function: sinh Function: sinh
@ -348,7 +348,7 @@ Function: sinh
Returns the hyperbolic sine of an angle `x` (measured in rad) Returns the hyperbolic sine of an angle `x` (measured in rad)
*/ */
pure fn sinh(x: float) -> float pure fn sinh(x: float) -> float
{ m_float::sinh(x as m_float) as float } { be m_float::sinh(x as m_float) as float }
/* /*
Function: sqrt Function: sqrt
@ -356,7 +356,7 @@ Function: sqrt
Returns the square root of `x` Returns the square root of `x`
*/ */
pure fn sqrt(x: float) -> float pure fn sqrt(x: float) -> float
{ m_float::sqrt(x as m_float) as float } { be m_float::sqrt(x as m_float) as float }
/* /*
Function: tan Function: tan
@ -365,7 +365,7 @@ Returns the tangent of an angle `x` (measured in rad)
*/ */
pure fn tan(x: float) -> float pure fn tan(x: float) -> float
{ m_float::tan(x as m_float) as float } { be m_float::tan(x as m_float) as float }
/* /*
Function: tanh Function: tanh
@ -374,7 +374,7 @@ Returns the hyperbolic tangent of an angle `x` (measured in rad)
*/ */
pure fn tanh(x: float) -> float pure fn tanh(x: float) -> float
{ m_float::tanh(x as m_float) as float } { be m_float::tanh(x as m_float) as float }
/* /*
Function: trunc Function: trunc
@ -383,7 +383,7 @@ Returns the integral value nearest to but no larger in magnitude than `x`
*/ */
pure fn trunc(x: float) -> float pure fn trunc(x: float) -> float
{ m_float::trunc(x as m_float) as float } { be m_float::trunc(x as m_float) as float }

1
src/libstd/math_f64.rs
View File

@ -17,6 +17,7 @@ export
export consts; export consts;
/* Module: consts */ /* Module: consts */
mod consts { mod consts {

6
src/libstd/std.rc
View File

@ -13,7 +13,7 @@ export comm, fs, io, net, run, sys, task, uv;
export c_vec, ctypes, either, option, result, four, tri, util; export c_vec, ctypes, either, option, result, four, tri, util;
export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap, ufind; export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap, ufind;
export rope; export rope;
export math, math_f32, math_f64; export math;
export ebml, dbg, getopts, json, rand, sha1, term, time, unsafe; export ebml, dbg, getopts, json, rand, sha1, term, time, unsafe;
export extfmt, test, tempfile; export extfmt, test, tempfile;
// FIXME: generic_os and os_fs shouldn't be exported // FIXME: generic_os and os_fs shouldn't be exported
@ -54,6 +54,8 @@ mod uv;
mod c_vec; mod c_vec;
mod ctypes; mod ctypes;
mod cmath; /* unexported */ mod cmath; /* unexported */
mod math_f32;
mod math_f64;
mod either; mod either;
mod option; mod option;
mod result; mod result;
@ -83,8 +85,6 @@ mod dbg;
mod getopts; mod getopts;
mod json; mod json;
mod math; mod math;
mod math_f32;
mod math_f64;
mod rand; mod rand;
mod sha1; mod sha1;
mod tempfile; mod tempfile;

3
src/test/stdtest/math.rs
View File

@ -160,8 +160,11 @@ fn test_exp_and_mod() {
let d2: float = 1.0; let d2: float = 1.0;
assert modf(float::infinity, d2) == 0.0; assert modf(float::infinity, d2) == 0.0;
assert d2 == float::infinity;
assert modf(float::neg_infinity, d2) == -0.0; assert modf(float::neg_infinity, d2) == -0.0;
assert d2 == float::neg_infinity;
assert float::isNaN(modf(float::NaN, d2)); assert float::isNaN(modf(float::NaN, d2));
assert float::isNaN(d2);
} }
#[test] #[test]