Skip to content

Commit 80b6850

Browse files
committed
libsyntax: Implement [int*3] syntax for fixed length vector types
1 parent 3688318 commit 80b6850

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,19 @@ class parser {
472472
ty_rec(elems)
473473
} else if self.token == token::LBRACKET {
474474
self.expect(token::LBRACKET);
475-
let t = ty_vec(self.parse_mt());
475+
let mut t = ty_vec(self.parse_mt());
476+
477+
// Parse the `* 3` in `[ int * 3 ]`
478+
match self.maybe_parse_fixed_vstore_with_star() {
479+
none => {}
480+
some(suffix) => {
481+
t = ty_fixed_length(@{
482+
id: self.get_id(),
483+
node: t,
484+
span: mk_sp(lo, self.last_span.hi)
485+
}, suffix)
486+
}
487+
}
476488
self.expect(token::RBRACKET);
477489
t
478490
} else if self.token == token::BINOP(token::AND) {
@@ -609,6 +621,22 @@ class parser {
609621
}
610622
}
611623

624+
fn maybe_parse_fixed_vstore_with_star() -> option<option<uint>> {
625+
if self.eat(token::BINOP(token::STAR)) {
626+
match copy self.token {
627+
token::UNDERSCORE => {
628+
self.bump(); some(none)
629+
}
630+
token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => {
631+
self.bump(); some(some(i as uint))
632+
}
633+
_ => none
634+
}
635+
} else {
636+
none
637+
}
638+
}
639+
612640
fn lit_from_token(tok: token::token) -> lit_ {
613641
match tok {
614642
token::LIT_INT(i, it) => lit_int(i, it),

src/test/run-pass/vec-fixed-length.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
fn main() {
2+
let x: [int*4] = [1, 2, 3, 4];
3+
io::println(fmt!("%d", x[0]));
4+
}
5+

0 commit comments

Comments
 (0)