Skip to content

Commit ea052f2

Browse files
committed
Derive Float for newtypes
1 parent 8b47c68 commit ea052f2

File tree

2 files changed

+200
-2
lines changed

2 files changed

+200
-2
lines changed

src/lib.rs

Lines changed: 185 additions & 1 deletion
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
//!
@@ -515,3 +515,187 @@ pub fn num(input: TokenStream) -> TokenStream {
515515
}
516516
}).into()
517517
}
518+
519+
#[proc_macro_derive(Float)]
520+
pub fn float(input: TokenStream) -> TokenStream {
521+
let ast: syn::DeriveInput = syn::parse(input).unwrap();
522+
let name = &ast.ident;
523+
let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
524+
dummy_const_trick("Float", &name, quote! {
525+
extern crate num_traits as _num_traits;
526+
impl _num_traits::Float for #name {
527+
fn nan() -> Self {
528+
#name(<#inner_ty as _num_traits::Float>::nan())
529+
}
530+
fn infinity() -> Self {
531+
#name(<#inner_ty as _num_traits::Float>::infinity())
532+
}
533+
fn neg_infinity() -> Self {
534+
#name(<#inner_ty as _num_traits::Float>::neg_infinity())
535+
}
536+
fn neg_zero() -> Self {
537+
#name(<#inner_ty as _num_traits::Float>::neg_zero())
538+
}
539+
fn min_value() -> Self {
540+
#name(<#inner_ty as _num_traits::Float>::min_value())
541+
}
542+
fn min_positive_value() -> Self {
543+
#name(<#inner_ty as _num_traits::Float>::min_positive_value())
544+
}
545+
fn max_value() -> Self {
546+
#name(<#inner_ty as _num_traits::Float>::max_value())
547+
}
548+
fn is_nan(self) -> bool {
549+
<#inner_ty as _num_traits::Float>::is_nan(self.0)
550+
}
551+
fn is_infinite(self) -> bool {
552+
<#inner_ty as _num_traits::Float>::is_infinite(self.0)
553+
}
554+
fn is_finite(self) -> bool {
555+
<#inner_ty as _num_traits::Float>::is_finite(self.0)
556+
}
557+
fn is_normal(self) -> bool {
558+
<#inner_ty as _num_traits::Float>::is_normal(self.0)
559+
}
560+
fn classify(self) -> ::std::num::FpCategory {
561+
<#inner_ty as _num_traits::Float>::classify(self.0)
562+
}
563+
fn floor(self) -> Self {
564+
#name(<#inner_ty as _num_traits::Float>::floor(self.0))
565+
}
566+
fn ceil(self) -> Self {
567+
#name(<#inner_ty as _num_traits::Float>::ceil(self.0))
568+
}
569+
fn round(self) -> Self {
570+
#name(<#inner_ty as _num_traits::Float>::round(self.0))
571+
}
572+
fn trunc(self) -> Self {
573+
#name(<#inner_ty as _num_traits::Float>::trunc(self.0))
574+
}
575+
fn fract(self) -> Self {
576+
#name(<#inner_ty as _num_traits::Float>::fract(self.0))
577+
}
578+
fn abs(self) -> Self {
579+
#name(<#inner_ty as _num_traits::Float>::abs(self.0))
580+
}
581+
fn signum(self) -> Self {
582+
#name(<#inner_ty as _num_traits::Float>::signum(self.0))
583+
}
584+
fn is_sign_positive(self) -> bool {
585+
<#inner_ty as _num_traits::Float>::is_sign_positive(self.0)
586+
}
587+
fn is_sign_negative(self) -> bool {
588+
<#inner_ty as _num_traits::Float>::is_sign_negative(self.0)
589+
}
590+
fn mul_add(self, a: Self, b: Self) -> Self {
591+
#name(<#inner_ty as _num_traits::Float>::mul_add(self.0, a.0, b.0))
592+
}
593+
fn recip(self) -> Self {
594+
#name(<#inner_ty as _num_traits::Float>::recip(self.0))
595+
}
596+
fn powi(self, n: i32) -> Self {
597+
#name(<#inner_ty as _num_traits::Float>::powi(self.0, n))
598+
}
599+
fn powf(self, n: Self) -> Self {
600+
#name(<#inner_ty as _num_traits::Float>::powf(self.0, n.0))
601+
}
602+
fn sqrt(self) -> Self {
603+
#name(<#inner_ty as _num_traits::Float>::sqrt(self.0))
604+
}
605+
fn exp(self) -> Self {
606+
#name(<#inner_ty as _num_traits::Float>::exp(self.0))
607+
}
608+
fn exp2(self) -> Self {
609+
#name(<#inner_ty as _num_traits::Float>::exp2(self.0))
610+
}
611+
fn ln(self) -> Self {
612+
#name(<#inner_ty as _num_traits::Float>::ln(self.0))
613+
}
614+
fn log(self, base: Self) -> Self {
615+
#name(<#inner_ty as _num_traits::Float>::log(self.0, base.0))
616+
}
617+
fn log2(self) -> Self {
618+
#name(<#inner_ty as _num_traits::Float>::log2(self.0))
619+
}
620+
fn log10(self) -> Self {
621+
#name(<#inner_ty as _num_traits::Float>::log10(self.0))
622+
}
623+
fn max(self, other: Self) -> Self {
624+
#name(<#inner_ty as _num_traits::Float>::max(self.0, other.0))
625+
}
626+
fn min(self, other: Self) -> Self {
627+
#name(<#inner_ty as _num_traits::Float>::min(self.0, other.0))
628+
}
629+
fn abs_sub(self, other: Self) -> Self {
630+
#name(<#inner_ty as _num_traits::Float>::abs_sub(self.0, other.0))
631+
}
632+
fn cbrt(self) -> Self {
633+
#name(<#inner_ty as _num_traits::Float>::cbrt(self.0))
634+
}
635+
fn hypot(self, other: Self) -> Self {
636+
#name(<#inner_ty as _num_traits::Float>::hypot(self.0, other.0))
637+
}
638+
fn sin(self) -> Self {
639+
#name(<#inner_ty as _num_traits::Float>::sin(self.0))
640+
}
641+
fn cos(self) -> Self {
642+
#name(<#inner_ty as _num_traits::Float>::cos(self.0))
643+
}
644+
fn tan(self) -> Self {
645+
#name(<#inner_ty as _num_traits::Float>::tan(self.0))
646+
}
647+
fn asin(self) -> Self {
648+
#name(<#inner_ty as _num_traits::Float>::asin(self.0))
649+
}
650+
fn acos(self) -> Self {
651+
#name(<#inner_ty as _num_traits::Float>::acos(self.0))
652+
}
653+
fn atan(self) -> Self {
654+
#name(<#inner_ty as _num_traits::Float>::atan(self.0))
655+
}
656+
fn atan2(self, other: Self) -> Self {
657+
#name(<#inner_ty as _num_traits::Float>::atan2(self.0, other.0))
658+
}
659+
fn sin_cos(self) -> (Self, Self) {
660+
let (x, y) = <#inner_ty as _num_traits::Float>::sin_cos(self.0);
661+
(#name(x), #name(y))
662+
}
663+
fn exp_m1(self) -> Self {
664+
#name(<#inner_ty as _num_traits::Float>::exp_m1(self.0))
665+
}
666+
fn ln_1p(self) -> Self {
667+
#name(<#inner_ty as _num_traits::Float>::ln_1p(self.0))
668+
}
669+
fn sinh(self) -> Self {
670+
#name(<#inner_ty as _num_traits::Float>::sinh(self.0))
671+
}
672+
fn cosh(self) -> Self {
673+
#name(<#inner_ty as _num_traits::Float>::cosh(self.0))
674+
}
675+
fn tanh(self) -> Self {
676+
#name(<#inner_ty as _num_traits::Float>::tanh(self.0))
677+
}
678+
fn asinh(self) -> Self {
679+
#name(<#inner_ty as _num_traits::Float>::asinh(self.0))
680+
}
681+
fn acosh(self) -> Self {
682+
#name(<#inner_ty as _num_traits::Float>::acosh(self.0))
683+
}
684+
fn atanh(self) -> Self {
685+
#name(<#inner_ty as _num_traits::Float>::atanh(self.0))
686+
}
687+
fn integer_decode(self) -> (u64, i16, i8) {
688+
<#inner_ty as _num_traits::Float>::integer_decode(self.0)
689+
}
690+
fn epsilon() -> Self {
691+
#name(<#inner_ty as _num_traits::Float>::epsilon())
692+
}
693+
fn to_degrees(self) -> Self {
694+
#name(<#inner_ty as _num_traits::Float>::to_degrees(self.0))
695+
}
696+
fn to_radians(self) -> Self {
697+
#name(<#inner_ty as _num_traits::Float>::to_radians(self.0))
698+
}
699+
}
700+
}).into()
701+
}

tests/newtype.rs

Lines changed: 15 additions & 1 deletion
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)