Skip to content

Commit 1b68e60

Browse files
asayersasayers
committed
Derive Float for newtypes
1 parent 8726b7c commit 1b68e60

File tree

2 files changed

+204
-2
lines changed

2 files changed

+204
-2
lines changed

‎src/lib.rs

+189-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![crate_type = "proc-macro"]
1212
#![doc(html_root_url = "https://docs.rs/num-derive/0.2")]
13-
#![recursion_limit="256"]
13+
#![recursion_limit="512"]
1414

1515
//! Procedural macros to derive numeric traits in Rust.
1616
//!
@@ -557,3 +557,191 @@ pub fn num(input: TokenStream) -> TokenStream {
557557
}
558558
}).into()
559559
}
560+
561+
/// Derives [`num_traits::Float`][float] for newtypes. The inner type must already implement
562+
/// `Float`.
563+
///
564+
/// [float]: https://docs.rs/num-traits/0.2/num_traits/cast/trait.Float.html
565+
#[proc_macro_derive(Float)]
566+
pub fn float(input: TokenStream) -> TokenStream {
567+
let ast: syn::DeriveInput = syn::parse(input).unwrap();
568+
let name = &ast.ident;
569+
let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
570+
dummy_const_trick("Float", &name, quote! {
571+
extern crate num_traits as _num_traits;
572+
impl _num_traits::Float for #name {
573+
fn nan() -> Self {
574+
#name(<#inner_ty as _num_traits::Float>::nan())
575+
}
576+
fn infinity() -> Self {
577+
#name(<#inner_ty as _num_traits::Float>::infinity())
578+
}
579+
fn neg_infinity() -> Self {
580+
#name(<#inner_ty as _num_traits::Float>::neg_infinity())
581+
}
582+
fn neg_zero() -> Self {
583+
#name(<#inner_ty as _num_traits::Float>::neg_zero())
584+
}
585+
fn min_value() -> Self {
586+
#name(<#inner_ty as _num_traits::Float>::min_value())
587+
}
588+
fn min_positive_value() -> Self {
589+
#name(<#inner_ty as _num_traits::Float>::min_positive_value())
590+
}
591+
fn max_value() -> Self {
592+
#name(<#inner_ty as _num_traits::Float>::max_value())
593+
}
594+
fn is_nan(self) -> bool {
595+
<#inner_ty as _num_traits::Float>::is_nan(self.0)
596+
}
597+
fn is_infinite(self) -> bool {
598+
<#inner_ty as _num_traits::Float>::is_infinite(self.0)
599+
}
600+
fn is_finite(self) -> bool {
601+
<#inner_ty as _num_traits::Float>::is_finite(self.0)
602+
}
603+
fn is_normal(self) -> bool {
604+
<#inner_ty as _num_traits::Float>::is_normal(self.0)
605+
}
606+
fn classify(self) -> ::std::num::FpCategory {
607+
<#inner_ty as _num_traits::Float>::classify(self.0)
608+
}
609+
fn floor(self) -> Self {
610+
#name(<#inner_ty as _num_traits::Float>::floor(self.0))
611+
}
612+
fn ceil(self) -> Self {
613+
#name(<#inner_ty as _num_traits::Float>::ceil(self.0))
614+
}
615+
fn round(self) -> Self {
616+
#name(<#inner_ty as _num_traits::Float>::round(self.0))
617+
}
618+
fn trunc(self) -> Self {
619+
#name(<#inner_ty as _num_traits::Float>::trunc(self.0))
620+
}
621+
fn fract(self) -> Self {
622+
#name(<#inner_ty as _num_traits::Float>::fract(self.0))
623+
}
624+
fn abs(self) -> Self {
625+
#name(<#inner_ty as _num_traits::Float>::abs(self.0))
626+
}
627+
fn signum(self) -> Self {
628+
#name(<#inner_ty as _num_traits::Float>::signum(self.0))
629+
}
630+
fn is_sign_positive(self) -> bool {
631+
<#inner_ty as _num_traits::Float>::is_sign_positive(self.0)
632+
}
633+
fn is_sign_negative(self) -> bool {
634+
<#inner_ty as _num_traits::Float>::is_sign_negative(self.0)
635+
}
636+
fn mul_add(self, a: Self, b: Self) -> Self {
637+
#name(<#inner_ty as _num_traits::Float>::mul_add(self.0, a.0, b.0))
638+
}
639+
fn recip(self) -> Self {
640+
#name(<#inner_ty as _num_traits::Float>::recip(self.0))
641+
}
642+
fn powi(self, n: i32) -> Self {
643+
#name(<#inner_ty as _num_traits::Float>::powi(self.0, n))
644+
}
645+
fn powf(self, n: Self) -> Self {
646+
#name(<#inner_ty as _num_traits::Float>::powf(self.0, n.0))
647+
}
648+
fn sqrt(self) -> Self {
649+
#name(<#inner_ty as _num_traits::Float>::sqrt(self.0))
650+
}
651+
fn exp(self) -> Self {
652+
#name(<#inner_ty as _num_traits::Float>::exp(self.0))
653+
}
654+
fn exp2(self) -> Self {
655+
#name(<#inner_ty as _num_traits::Float>::exp2(self.0))
656+
}
657+
fn ln(self) -> Self {
658+
#name(<#inner_ty as _num_traits::Float>::ln(self.0))
659+
}
660+
fn log(self, base: Self) -> Self {
661+
#name(<#inner_ty as _num_traits::Float>::log(self.0, base.0))
662+
}
663+
fn log2(self) -> Self {
664+
#name(<#inner_ty as _num_traits::Float>::log2(self.0))
665+
}
666+
fn log10(self) -> Self {
667+
#name(<#inner_ty as _num_traits::Float>::log10(self.0))
668+
}
669+
fn max(self, other: Self) -> Self {
670+
#name(<#inner_ty as _num_traits::Float>::max(self.0, other.0))
671+
}
672+
fn min(self, other: Self) -> Self {
673+
#name(<#inner_ty as _num_traits::Float>::min(self.0, other.0))
674+
}
675+
fn abs_sub(self, other: Self) -> Self {
676+
#name(<#inner_ty as _num_traits::Float>::abs_sub(self.0, other.0))
677+
}
678+
fn cbrt(self) -> Self {
679+
#name(<#inner_ty as _num_traits::Float>::cbrt(self.0))
680+
}
681+
fn hypot(self, other: Self) -> Self {
682+
#name(<#inner_ty as _num_traits::Float>::hypot(self.0, other.0))
683+
}
684+
fn sin(self) -> Self {
685+
#name(<#inner_ty as _num_traits::Float>::sin(self.0))
686+
}
687+
fn cos(self) -> Self {
688+
#name(<#inner_ty as _num_traits::Float>::cos(self.0))
689+
}
690+
fn tan(self) -> Self {
691+
#name(<#inner_ty as _num_traits::Float>::tan(self.0))
692+
}
693+
fn asin(self) -> Self {
694+
#name(<#inner_ty as _num_traits::Float>::asin(self.0))
695+
}
696+
fn acos(self) -> Self {
697+
#name(<#inner_ty as _num_traits::Float>::acos(self.0))
698+
}
699+
fn atan(self) -> Self {
700+
#name(<#inner_ty as _num_traits::Float>::atan(self.0))
701+
}
702+
fn atan2(self, other: Self) -> Self {
703+
#name(<#inner_ty as _num_traits::Float>::atan2(self.0, other.0))
704+
}
705+
fn sin_cos(self) -> (Self, Self) {
706+
let (x, y) = <#inner_ty as _num_traits::Float>::sin_cos(self.0);
707+
(#name(x), #name(y))
708+
}
709+
fn exp_m1(self) -> Self {
710+
#name(<#inner_ty as _num_traits::Float>::exp_m1(self.0))
711+
}
712+
fn ln_1p(self) -> Self {
713+
#name(<#inner_ty as _num_traits::Float>::ln_1p(self.0))
714+
}
715+
fn sinh(self) -> Self {
716+
#name(<#inner_ty as _num_traits::Float>::sinh(self.0))
717+
}
718+
fn cosh(self) -> Self {
719+
#name(<#inner_ty as _num_traits::Float>::cosh(self.0))
720+
}
721+
fn tanh(self) -> Self {
722+
#name(<#inner_ty as _num_traits::Float>::tanh(self.0))
723+
}
724+
fn asinh(self) -> Self {
725+
#name(<#inner_ty as _num_traits::Float>::asinh(self.0))
726+
}
727+
fn acosh(self) -> Self {
728+
#name(<#inner_ty as _num_traits::Float>::acosh(self.0))
729+
}
730+
fn atanh(self) -> Self {
731+
#name(<#inner_ty as _num_traits::Float>::atanh(self.0))
732+
}
733+
fn integer_decode(self) -> (u64, i16, i8) {
734+
<#inner_ty as _num_traits::Float>::integer_decode(self.0)
735+
}
736+
fn epsilon() -> Self {
737+
#name(<#inner_ty as _num_traits::Float>::epsilon())
738+
}
739+
fn to_degrees(self) -> Self {
740+
#name(<#inner_ty as _num_traits::Float>::to_degrees(self.0))
741+
}
742+
fn to_radians(self) -> Self {
743+
#name(<#inner_ty as _num_traits::Float>::to_radians(self.0))
744+
}
745+
}
746+
}).into()
747+
}

‎tests/newtype.rs

+15-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ extern crate num as num_renamed;
22
#[macro_use]
33
extern crate num_derive;
44

5-
use num_renamed::{FromPrimitive, ToPrimitive, NumCast, One, Zero, Num};
5+
use num_renamed::{FromPrimitive, ToPrimitive, NumCast, One, Zero, Num, Float};
6+
use std::ops::Neg;
67

78
#[derive(
89
Debug,
@@ -17,9 +18,17 @@ use num_renamed::{FromPrimitive, ToPrimitive, NumCast, One, Zero, Num};
1718
One,
1819
Zero,
1920
Num,
21+
Float,
2022
)]
2123
struct MyFloat(f64);
2224

25+
impl Neg for MyFloat {
26+
type Output = MyFloat;
27+
fn neg(self) -> Self {
28+
MyFloat(self.0.neg())
29+
}
30+
}
31+
2332
#[test]
2433
fn test_from_primitive() {
2534
assert_eq!(MyFloat::from_u32(25), Some(MyFloat(25.0)));
@@ -58,3 +67,8 @@ fn test_one() {
5867
fn test_num() {
5968
assert_eq!(MyFloat::from_str_radix("25", 10).ok(), Some(MyFloat(25.0)));
6069
}
70+
71+
#[test]
72+
fn test_float() {
73+
assert_eq!(MyFloat(4.0).log(MyFloat(2.0)), MyFloat(2.0));
74+
}

0 commit comments

Comments
 (0)