Add new crate num-derive as an new replacement for num-macro

Author: hauleth

.travis/test_nightly.sh

@@ -5,6 +5,7 @@ set -ex
 cargo bench --verbose
 
 cargo test --verbose --manifest-path=macros/Cargo.toml
+cargo test --verbose --manifest-path=derive/Cargo.toml
 
 # Build test for the serde feature
 cargo build --verbose --features "serde"

derive/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+authors = ["The Rust Project Developers"]
+description = "Numeric syntax extensions"
+documentation = "http://rust-num.github.io/num"
+homepage = "https://github.com/rust-num/num"
+keywords = ["mathematics", "numerics"]
+license = "MIT/Apache-2.0"
+name = "num-derive"
+repository = "https://github.com/rust-num/num"
+version = "0.1.33"
+
+[dependencies]
+quote = "0.1.3"
+syn = "0.7.0"
+
+[dev-dependencies]
+compiletest_rs = "0.2.2"
+
+[dev-dependencies.num]
+path = ".."
+version = "0.1"
+
+[lib]
+crate-type = ["rustc-macro"]
+name = "num_derive"
+rustc-macro = true
+test = false

derive/src/lib.rs

@@ -0,0 +1,76 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type = "rustc-macro"]
+#![feature(rustc_macro, rustc_macro_lib)]
+
+extern crate syn;
+#[macro_use]
+extern crate quote;
+extern crate rustc_macro;
+
+use rustc_macro::TokenStream;
+
+use syn::Body::Enum;
+use syn::VariantData::Unit;
+
+#[rustc_macro_derive(FromPrimitive)]
+pub fn from_primitive(input: TokenStream) -> TokenStream {
+    let source = input.to_string();
+
+    let ast = syn::parse_macro_input(&source).unwrap();
+    let name = &ast.ident;
+
+    let variants = match ast.body {
+        Enum(ref variants) => variants,
+        _ => {
+            panic!("`FromPrimitive` can be applied only to the enums, {} is not an enum",
+                   name)
+        }
+    };
+
+    let mut idx = 0;
+    let variants: Vec<_> = variants.iter()
+        .map(|variant| {
+            let ident = &variant.ident;
+            match variant.data {
+                Unit => (),
+                _ => {
+                    panic!("`FromPrimitive` can be applied only to unitary enums, {}::{} is either struct or tuple", name, ident)
+                },
+            }
+            if let Some(val) = variant.discriminant {
+                idx = val.value;
+            }
+            let tt = quote!(#idx => Some(#name::#ident));
+            idx += 1;
+            tt
+        })
+        .collect();
+
+    let res = quote! {
+        #ast
+
+        impl ::num::traits::FromPrimitive for #name {
+            fn from_i64(n: i64) -> Option<Self> {
+                Self::from_u64(n as u64)
+            }
+
+            fn from_u64(n: u64) -> Option<Self> {
+                match n {
+                    #(variants,)*
+                    _ => None,
+                }
+            }
+        }
+    };
+
+    res.to_string().parse().unwrap()
+}

macros/tests/compile-fail/derive_on_struct.rs derive/tests/compile-fail/derive_on_struct.rs

@@ -13,7 +13,7 @@
 
 extern crate num;
 #[macro_use]
-extern crate num_macros;
+extern crate num_derive;
 
 #[derive(Debug, PartialEq, FromPrimitive)] //~ ERROR
 struct Color {

macros/tests/compile-fail/enum_with_associated_data.rs derive/tests/compile-fail/enum_with_associated_data.rs

@@ -13,7 +13,7 @@
 
 extern crate num;
 #[macro_use]
-extern crate num_macros;
+extern crate num_derive;
 
 #[derive(Debug, PartialEq, FromPrimitive)] //~ ERROR
 enum Color {

macros/tests/compiletest.rs derive/tests/compiletest.rs

@@ -13,7 +13,7 @@
 
 extern crate num;
 #[macro_use]
-extern crate num_macros;
+extern crate num_derive;
 
 #[derive(Debug, PartialEq, FromPrimitive)]
 enum Color {}

macros/tests/empty_enum.rs derive/tests/empty_enum.rs

@@ -12,7 +12,7 @@
 
 extern crate num;
 #[macro_use]
-extern crate num_macros;
+extern crate num_derive;
 
 #[derive(Debug, PartialEq, FromPrimitive)]
 enum Color {

macros/tests/trivial.rs derive/tests/trivial.rs

@@ -12,7 +12,7 @@
 
 extern crate num;
 #[macro_use]
-extern crate num_macros;
+extern crate num_derive;
 
 #[derive(Debug, PartialEq, FromPrimitive)]
 enum Color {

macros/tests/with_custom_values.rs derive/tests/with_custom_values.rs

@@ -1,27 +1,17 @@
 [package]
+name = "num-macros"
+version = "0.1.33"
 authors = ["The Rust Project Developers"]
-description = "Numeric syntax extensions"
-documentation = "http://rust-num.github.io/num"
-homepage = "https://github.com/rust-num/num"
-keywords = ["mathematics", "numerics"]
 license = "MIT/Apache-2.0"
-name = "num-macros"
+homepage = "https://github.com/rust-num/num"
 repository = "https://github.com/rust-num/num"
-version = "0.1.33"
-
-[dependencies]
-quote = "0.1.3"
-syn = "0.6.0"
-
-[dev-dependencies]
-compiletest_rs = "0.2.2"
-
-[dev-dependencies.num]
-path = ".."
-version = "0.1"
+documentation = "http://rust-num.github.io/num"
+keywords = ["mathematics", "numerics"]
+description = "Numeric syntax extensions"
 
 [lib]
-crate-type = ["rustc-macro"]
 name = "num_macros"
-rustc-macro = true
-test = false
+plugin = true
+
+[dev-dependencies]
+num = { path = "..", version = "0.1" }