bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Allow constant expressions in [Type * n].

Browse source
This commit is contained in:
Luqman Aden 2013-03-04 18:03:21 -08:00
parent e78f2e2ac5
commit 42f95d055c
4 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libsyntax/parse/parser.rs
View file

@ -642,7 +642,8 @@ pub impl Parser {
self.obsolete(*self.last_span, ObsoleteMutVector);
}
// Parse the `* 3` in `[ int * 3 ]`
// Parse the `* e` in `[ int * e ]`
// where `e` is a const expression
let t = match self.maybe_parse_fixed_vstore_with_star() {
None => ty_vec(mt),
Some(suffix) => ty_fixed_length_vec(mt, suffix)
@ -814,23 +815,9 @@ pub impl Parser {
})
}
fn maybe_parse_fixed_vstore_with_star(&self) -> Option<uint> {
fn maybe_parse_fixed_vstore_with_star(&self) -> Option<@ast::expr> {
if self.eat(&token::BINOP(token::STAR)) {
match *self.token {
token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => {
self.bump();
Some(i as uint)
}
_ => {
self.fatal(
fmt!(
"expected integral vector length \
but found `%s`",
token_to_str(self.reader, &copy *self.token)
)
);
}
}
Some(self.parse_expr())
} else {
None
}