Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement a deriving(Zero) attribute #7142

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/libstd/char.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use u32;
use uint;
use unicode::{derived_property, general_category};

#[cfg(not(test))]
use cmp::{Eq, Ord};
#[cfg(not(test))] use cmp::{Eq, Ord};
#[cfg(not(test))] use num::Zero;

/*
Lu Uppercase_Letter an uppercase letter
Expand Down Expand Up @@ -328,6 +328,12 @@ impl Ord for char {
fn ge(&self, other: &char) -> bool { *self >= *other }
}

#[cfg(not(test))]
impl Zero for char {
fn zero() -> char { 0 as char }
fn is_zero(&self) -> bool { *self == 0 as char }
}

#[test]
fn test_is_lowercase() {
assert!('a'.is_lowercase());
Expand Down
15 changes: 15 additions & 0 deletions src/libstd/num/num.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,21 @@ pub fn pow_with_uint<T:NumCast+One+Zero+Copy+Div<T,T>+Mul<T,T>>(radix: uint, pow
total
}

impl<T: Zero> Zero for @mut T {
fn zero() -> @mut T { @mut Zero::zero() }
fn is_zero(&self) -> bool { (**self).is_zero() }
}

impl<T: Zero> Zero for @T {
fn zero() -> @T { @Zero::zero() }
fn is_zero(&self) -> bool { (**self).is_zero() }
}

impl<T: Zero> Zero for ~T {
fn zero() -> ~T { ~Zero::zero() }
fn is_zero(&self) -> bool { (**self).is_zero() }
}

/// Helper function for testing numeric operations
#[cfg(test)]
pub fn test_num<T:Num + NumCast>(ten: T, two: T) {
Expand Down
5 changes: 5 additions & 0 deletions src/libstd/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,11 @@ impl<T:Copy + Zero> Option<T> {
}
}

impl<T> Zero for Option<T> {
fn zero() -> Option<T> { None }
fn is_zero(&self) -> bool { self.is_none() }
}

/// Immutable iterator over an `Option<A>`
pub struct OptionIterator<'self, A> {
priv opt: Option<&'self A>
Expand Down
11 changes: 11 additions & 0 deletions src/libstd/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use container::Container;
use iter::Times;
use iterator::{Iterator, IteratorUtil, FilterIterator, AdditiveIterator};
use libc;
use num::Zero;
use option::{None, Option, Some};
use old_iter::{BaseIter, EqIter};
use ptr;
Expand Down Expand Up @@ -2250,6 +2251,16 @@ impl<'self> Iterator<u8> for StrBytesRevIterator<'self> {
}
}

impl Zero for ~str {
fn zero() -> ~str { ~"" }
fn is_zero(&self) -> bool { self.len() == 0 }
}

impl Zero for @str {
fn zero() -> @str { @"" }
fn is_zero(&self) -> bool { self.len() == 0 }
}

#[cfg(test)]
mod tests {
use iterator::IteratorUtil;
Expand Down
13 changes: 13 additions & 0 deletions src/libstd/tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ macro_rules! tuple_impls {
pub mod inner {
use clone::Clone;
#[cfg(not(test))] use cmp::*;
#[cfg(not(test))] use num::Zero;

$(
pub trait $cloneable_trait<$($T),+> {
Expand Down Expand Up @@ -210,6 +211,18 @@ macro_rules! tuple_impls {
lexical_cmp!($(self.$get_ref_fn(), other.$get_ref_fn()),+)
}
}

#[cfg(not(test))]
impl<$($T:Zero),+> Zero for ($($T),+) {
#[inline]
fn zero() -> ($($T),+) {
($(Zero::zero::<$T>()),+)
}
#[inline]
fn is_zero(&self) -> bool {
$(self.$get_ref_fn().is_zero())&&+
}
}
)+
}
}
Expand Down
11 changes: 11 additions & 0 deletions src/libstd/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use iterator::{Iterator, IteratorUtil};
use iter::FromIter;
use kinds::Copy;
use libc;
use num::Zero;
use old_iter::CopyableIter;
use option::{None, Option, Some};
use ptr::to_unsafe_ptr;
Expand Down Expand Up @@ -2702,6 +2703,16 @@ impl<A:Clone> Clone for ~[A] {
}
}

impl<A> Zero for ~[A] {
fn zero() -> ~[A] { ~[] }
fn is_zero(&self) -> bool { self.len() == 0 }
}

impl<A> Zero for @[A] {
fn zero() -> @[A] { @[] }
fn is_zero(&self) -> bool { self.len() == 0 }
}

macro_rules! iterator {
/* FIXME: #4375 Cannot attach documentation/attributes to a macro generated struct.
(struct $name:ident -> $ptr:ty, $elem:ty) => {
Expand Down
2 changes: 2 additions & 0 deletions src/libsyntax/ext/deriving/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pub mod encodable;
pub mod decodable;
pub mod rand;
pub mod to_str;
pub mod zero;

#[path="cmp/eq.rs"]
pub mod eq;
Expand Down Expand Up @@ -99,6 +100,7 @@ pub fn expand_meta_deriving(cx: @ExtCtxt,
"Rand" => expand!(rand::expand_deriving_rand),

"ToStr" => expand!(to_str::expand_deriving_to_str),
"Zero" => expand!(zero::expand_deriving_zero),

ref tname => {
cx.span_err(titem.span, fmt!("unknown \
Expand Down
96 changes: 96 additions & 0 deletions src/libsyntax/ext/deriving/zero.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
// Copyright 2012-2013 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.

use core::prelude::*;

use ast::{meta_item, item, expr};
use codemap::span;
use ext::base::ExtCtxt;
use ext::build::AstBuilder;
use ext::deriving::generic::*;

use core::vec;

pub fn expand_deriving_zero(cx: @ExtCtxt,
span: span,
mitem: @meta_item,
in_items: ~[@item])
-> ~[@item] {
let trait_def = TraitDef {
path: Path::new(~["std", "num", "Zero"]),
additional_bounds: ~[],
generics: LifetimeBounds::empty(),
methods: ~[
MethodDef {
name: "zero",
generics: LifetimeBounds::empty(),
explicit_self: None,
args: ~[],
ret_ty: Self,
const_nonmatching: false,
combine_substructure: zero_substructure
},
MethodDef {
name: "is_zero",
generics: LifetimeBounds::empty(),
explicit_self: borrowed_explicit_self(),
args: ~[],
ret_ty: Literal(Path::new(~["bool"])),
const_nonmatching: false,
combine_substructure: |cx, span, substr| {
cs_and(|cx, span, _, _| cx.span_bug(span,
"Non-matching enum \
variant in \
deriving(Zero)"),
cx, span, substr)
}
}
]
};
trait_def.expand(cx, span, mitem, in_items)
}

fn zero_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr {
let zero_ident = ~[
cx.ident_of("std"),
cx.ident_of("num"),
cx.ident_of("Zero"),
cx.ident_of("zero")
];
let zero_call = || {
cx.expr_call_global(span, copy zero_ident, ~[])
};

return match *substr.fields {
StaticStruct(_, ref summary) => {
match *summary {
Left(count) => {
if count == 0 {
cx.expr_ident(span, substr.type_ident)
} else {
let exprs = vec::from_fn(count, |_| zero_call());
cx.expr_call_ident(span, substr.type_ident, exprs)
}
}
Right(ref fields) => {
let zero_fields = do fields.map |ident| {
cx.field_imm(span, *ident, zero_call())
};
cx.expr_struct_ident(span, substr.type_ident, zero_fields)
}
}
}
StaticEnum(*) => {
cx.span_fatal(span, "`Zero` cannot be derived for enums, \
only structs")
}
_ => cx.bug("Non-static method in `deriving(Zero)`")
};
}
40 changes: 40 additions & 0 deletions src/test/run-pass/deriving-zero.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright 2012-2013 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.

use std::util;
use std::num::Zero;

#[deriving(Zero)]
struct A;
#[deriving(Zero)]
struct B(int);
#[deriving(Zero)]
struct C(int, int);
#[deriving(Zero)]
struct D { a: int }
#[deriving(Zero)]
struct E { a: int, b: int }

#[deriving(Zero)]
struct Lots {
a: ~str,
b: @str,
c: Option<util::NonCopyable>,
d: u8,
e: char,
f: float,
g: (f32, char),
h: ~[util::NonCopyable],
i: @mut (int, int),
}

fn main() {
assert!(Zero::zero::<Lots>().is_zero());
}