diff options
Diffstat (limited to 'src')
10 files changed, 156 insertions, 13 deletions
diff --git a/src/libcore/num/num.rs b/src/libcore/num/num.rs index c661e7ea1f8..96b302d3174 100644 --- a/src/libcore/num/num.rs +++ b/src/libcore/num/num.rs @@ -396,8 +396,7 @@ pub trait FromStrRadix { /// - If code written to use this function doesn't care about it, it's /// probably assuming that `x^0` always equals `1`. /// -pub fn pow_with_uint<T:NumCast+One+Zero+Copy+Div<T,T>+Mul<T,T>>( - radix: uint, pow: uint) -> T { +pub fn pow_with_uint<T:NumCast+One+Zero+Copy+Div<T,T>+Mul<T,T>>(radix: uint, pow: uint) -> T { let _0: T = Zero::zero(); let _1: T = One::one(); @@ -405,7 +404,7 @@ pub fn pow_with_uint<T:NumCast+One+Zero+Copy+Div<T,T>+Mul<T,T>>( if radix == 0u { return _0; } let mut my_pow = pow; let mut total = _1; - let mut multiplier = cast(radix as int); + let mut multiplier = cast(radix); while (my_pow > 0u) { if my_pow % 2u == 1u { total *= multiplier; @@ -422,13 +421,13 @@ pub fn test_num<T:Num + NumCast>(ten: T, two: T) { assert_eq!(ten.add(&two), cast(12)); assert_eq!(ten.sub(&two), cast(8)); assert_eq!(ten.mul(&two), cast(20)); - assert_eq!(ten.div(&two), cast(5)); + assert_eq!(ten.div(&two), cast(5)); assert_eq!(ten.rem(&two), cast(0)); assert_eq!(ten.add(&two), ten + two); assert_eq!(ten.sub(&two), ten - two); assert_eq!(ten.mul(&two), ten * two); - assert_eq!(ten.div(&two), ten / two); + assert_eq!(ten.div(&two), ten / two); assert_eq!(ten.rem(&two), ten % two); } diff --git a/src/libsyntax/ext/bytes.rs b/src/libsyntax/ext/bytes.rs index 03020f26a93..7c2f27ada3b 100644 --- a/src/libsyntax/ext/bytes.rs +++ b/src/libsyntax/ext/bytes.rs @@ -16,13 +16,58 @@ use ext::base::*; use ext::base; use ext::build::{mk_u8, mk_slice_vec_e}; -pub fn expand_syntax_ext(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree]) - -> base::MacResult { - let var = get_single_str_from_tts(cx, sp, tts, "bytes!"); +pub fn expand_syntax_ext(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree]) -> base::MacResult { + // Gather all argument expressions + let exprs = get_exprs_from_tts(cx, tts); let mut bytes = ~[]; - for var.each |byte| { - bytes.push(mk_u8(cx, sp, byte)); + + for exprs.each |expr| { + match expr.node { + // expression is a literal + ast::expr_lit(lit) => match lit.node { + // string literal, push each byte to vector expression + ast::lit_str(s) => { + for s.each |byte| { + bytes.push(mk_u8(cx, sp, byte)); + } + } + + // u8 literal, push to vector expression + ast::lit_uint(v, ast::ty_u8) => { + if v > 0xFF { + cx.span_err(sp, "Too large u8 literal in bytes!") + } else { + bytes.push(mk_u8(cx, sp, v as u8)); + } + } + + // integer literal, push to vector expression + ast::lit_int_unsuffixed(v) => { + if v > 0xFF { + cx.span_err(sp, "Too large integer literal in bytes!") + } else if v < 0 { + cx.span_err(sp, "Negative integer literal in bytes!") + } else { + bytes.push(mk_u8(cx, sp, v as u8)); + } + } + + // char literal, push to vector expression + ast::lit_int(v, ast::ty_char) => { + if (v as char).is_ascii() { + bytes.push(mk_u8(cx, sp, v as u8)); + } else { + cx.span_err(sp, "Non-ascii char literal in bytes!") + } + } + + _ => cx.span_err(sp, "Unsupported literal in bytes!") + }, + + _ => cx.span_err(sp, "Non-literal in bytes!") + } } + let e = mk_slice_vec_e(cx, sp, bytes); MRExpr(e) } diff --git a/src/test/compile-fail/syntax-extension-bytes-non-ascii-char-literal.rs b/src/test/compile-fail/syntax-extension-bytes-non-ascii-char-literal.rs new file mode 100644 index 00000000000..8bdc643f288 --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-non-ascii-char-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!('λ'); //~ ERROR Non-ascii char literal in bytes! +} diff --git a/src/test/compile-fail/syntax-extension-bytes-non-literal.rs b/src/test/compile-fail/syntax-extension-bytes-non-literal.rs new file mode 100644 index 00000000000..fed6bdc9470 --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-non-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(foo); //~ ERROR Non-literal in bytes! +} diff --git a/src/test/compile-fail/syntax-extension-bytes-too-large-integer-literal.rs b/src/test/compile-fail/syntax-extension-bytes-too-large-integer-literal.rs new file mode 100644 index 00000000000..8acb280dfde --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-too-large-integer-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(1024); //~ ERROR Too large integer literal in bytes! +} diff --git a/src/test/compile-fail/syntax-extension-bytes-too-large-u8-literal.rs b/src/test/compile-fail/syntax-extension-bytes-too-large-u8-literal.rs new file mode 100644 index 00000000000..b7d69a3054f --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-too-large-u8-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(1024u8); //~ ERROR Too large u8 literal in bytes! +} diff --git a/src/test/compile-fail/syntax-extension-bytes-too-small-integer-literal.rs b/src/test/compile-fail/syntax-extension-bytes-too-small-integer-literal.rs new file mode 100644 index 00000000000..cec2dc0a8e0 --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-too-small-integer-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(-1024); //~ ERROR Non-literal in bytes +} diff --git a/src/test/compile-fail/syntax-extension-bytes-too-small-u8-literal.rs b/src/test/compile-fail/syntax-extension-bytes-too-small-u8-literal.rs new file mode 100644 index 00000000000..2df55a6436c --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-too-small-u8-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(-1024u8); //~ ERROR Non-literal in bytes +} diff --git a/src/test/compile-fail/syntax-extension-bytes-unsupported-literal.rs b/src/test/compile-fail/syntax-extension-bytes-unsupported-literal.rs new file mode 100644 index 00000000000..b7d55385d1c --- /dev/null +++ b/src/test/compile-fail/syntax-extension-bytes-unsupported-literal.rs @@ -0,0 +1,13 @@ +// Copyright 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. + +fn main() { + let vec = bytes!(45f); //~ ERROR Unsupported literal in bytes! +} diff --git a/src/test/run-pass/syntax-extension-bytes.rs b/src/test/run-pass/syntax-extension-bytes.rs index 9249267355d..bdaae65bc3c 100644 --- a/src/test/run-pass/syntax-extension-bytes.rs +++ b/src/test/run-pass/syntax-extension-bytes.rs @@ -8,9 +8,17 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +static static_vec: &'static [u8] = bytes!("abc", 0xFF, '!'); + fn main() { let vec = bytes!("abc"); - assert_eq!(vec[0], 97); - assert_eq!(vec[1], 98); - assert_eq!(vec[2], 99); + assert_eq!(vec, &[97_u8, 98_u8, 99_u8]); + + let vec = bytes!("null", 0); + assert_eq!(vec, &[110_u8, 117_u8, 108_u8, 108_u8, 0_u8]); + + let vec = bytes!(' ', " ", 32, 32u8); + assert_eq!(vec, &[32_u8, 32_u8, 32_u8, 32_u8]); + + assert_eq!(static_vec, &[97_u8, 98_u8, 99_u8, 255_u8, 33_u8]); } |