syntax: add #[deriving(Default)] syntax extension
This commit is contained in:
parent
ca47eebb44
commit
a0e123eb6e
3 changed files with 123 additions and 2 deletions
|
@ -137,7 +137,17 @@ fn list_dir_sorted(path: &Path) -> ~[Path] {
|
||||||
/**
|
/**
|
||||||
* A compiled Unix shell style pattern.
|
* A compiled Unix shell style pattern.
|
||||||
*/
|
*/
|
||||||
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Zero)]
|
#[cfg(stage0)]
|
||||||
|
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes)]
|
||||||
|
pub struct Pattern {
|
||||||
|
priv tokens: ~[PatternToken]
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A compiled Unix shell style pattern.
|
||||||
|
*/
|
||||||
|
#[cfg(not(stage0))]
|
||||||
|
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)]
|
||||||
pub struct Pattern {
|
pub struct Pattern {
|
||||||
priv tokens: ~[PatternToken]
|
priv tokens: ~[PatternToken]
|
||||||
}
|
}
|
||||||
|
@ -458,7 +468,37 @@ fn is_sep(c: char) -> bool {
|
||||||
/**
|
/**
|
||||||
* Configuration options to modify the behaviour of `Pattern::matches_with(..)`
|
* Configuration options to modify the behaviour of `Pattern::matches_with(..)`
|
||||||
*/
|
*/
|
||||||
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Zero)]
|
#[cfg(stage0)]
|
||||||
|
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes)]
|
||||||
|
pub struct MatchOptions {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether or not patterns should be matched in a case-sensitive manner. This
|
||||||
|
* currently only considers upper/lower case relationships between ASCII characters,
|
||||||
|
* but in future this might be extended to work with Unicode.
|
||||||
|
*/
|
||||||
|
case_sensitive: bool,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this is true then path-component separator characters (e.g. `/` on Posix)
|
||||||
|
* must be matched by a literal `/`, rather than by `*` or `?` or `[...]`
|
||||||
|
*/
|
||||||
|
require_literal_separator: bool,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this is true then paths that contain components that start with a `.` will
|
||||||
|
* not match unless the `.` appears literally in the pattern: `*`, `?` or `[...]`
|
||||||
|
* will not match. This is useful because such files are conventionally considered
|
||||||
|
* hidden on Unix systems and it might be desirable to skip them when listing files.
|
||||||
|
*/
|
||||||
|
require_literal_leading_dot: bool
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration options to modify the behaviour of `Pattern::matches_with(..)`
|
||||||
|
*/
|
||||||
|
#[cfg(not(stage0))]
|
||||||
|
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)]
|
||||||
pub struct MatchOptions {
|
pub struct MatchOptions {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
79
src/libsyntax/ext/deriving/default.rs
Normal file
79
src/libsyntax/ext/deriving/default.rs
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
// 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 ast::{MetaItem, item, Expr};
|
||||||
|
use codemap::Span;
|
||||||
|
use ext::base::ExtCtxt;
|
||||||
|
use ext::build::AstBuilder;
|
||||||
|
use ext::deriving::generic::*;
|
||||||
|
|
||||||
|
use std::vec;
|
||||||
|
|
||||||
|
pub fn expand_deriving_default(cx: @ExtCtxt,
|
||||||
|
span: Span,
|
||||||
|
mitem: @MetaItem,
|
||||||
|
in_items: ~[@item])
|
||||||
|
-> ~[@item] {
|
||||||
|
let trait_def = TraitDef {
|
||||||
|
path: Path::new(~["std", "default", "Default"]),
|
||||||
|
additional_bounds: ~[],
|
||||||
|
generics: LifetimeBounds::empty(),
|
||||||
|
methods: ~[
|
||||||
|
MethodDef {
|
||||||
|
name: "default",
|
||||||
|
generics: LifetimeBounds::empty(),
|
||||||
|
explicit_self: None,
|
||||||
|
args: ~[],
|
||||||
|
ret_ty: Self,
|
||||||
|
const_nonmatching: false,
|
||||||
|
combine_substructure: default_substructure
|
||||||
|
},
|
||||||
|
]
|
||||||
|
};
|
||||||
|
trait_def.expand(cx, span, mitem, in_items)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Expr {
|
||||||
|
let default_ident = ~[
|
||||||
|
cx.ident_of("std"),
|
||||||
|
cx.ident_of("default"),
|
||||||
|
cx.ident_of("Default"),
|
||||||
|
cx.ident_of("default")
|
||||||
|
];
|
||||||
|
let default_call = || {
|
||||||
|
cx.expr_call_global(span, default_ident.clone(), ~[])
|
||||||
|
};
|
||||||
|
|
||||||
|
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, |_| default_call());
|
||||||
|
cx.expr_call_ident(span, substr.type_ident, exprs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Right(ref fields) => {
|
||||||
|
let default_fields = do fields.map |ident| {
|
||||||
|
cx.field_imm(span, *ident, default_call())
|
||||||
|
};
|
||||||
|
cx.expr_struct_ident(span, substr.type_ident, default_fields)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
StaticEnum(*) => {
|
||||||
|
cx.span_fatal(span, "`Default` cannot be derived for enums, \
|
||||||
|
only structs")
|
||||||
|
}
|
||||||
|
_ => cx.bug("Non-static method in `deriving(Default)`")
|
||||||
|
};
|
||||||
|
}
|
|
@ -31,6 +31,7 @@ pub mod decodable;
|
||||||
pub mod rand;
|
pub mod rand;
|
||||||
pub mod to_str;
|
pub mod to_str;
|
||||||
pub mod zero;
|
pub mod zero;
|
||||||
|
pub mod default;
|
||||||
|
|
||||||
#[path="cmp/eq.rs"]
|
#[path="cmp/eq.rs"]
|
||||||
pub mod eq;
|
pub mod eq;
|
||||||
|
@ -97,6 +98,7 @@ pub fn expand_meta_deriving(cx: @ExtCtxt,
|
||||||
|
|
||||||
"ToStr" => expand!(to_str::expand_deriving_to_str),
|
"ToStr" => expand!(to_str::expand_deriving_to_str),
|
||||||
"Zero" => expand!(zero::expand_deriving_zero),
|
"Zero" => expand!(zero::expand_deriving_zero),
|
||||||
|
"Default" => expand!(default::expand_deriving_default),
|
||||||
|
|
||||||
ref tname => {
|
ref tname => {
|
||||||
cx.span_err(titem.span, fmt!("unknown \
|
cx.span_err(titem.span, fmt!("unknown \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue