---

yaml
---
r: 23195
b: refs/heads/master
c: 80b6850
h: refs/heads/master
i:
  23193: dd937d3
  23191: daf76c5
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 36883186ab88e7b39ea2cb0f47c2c8999840663e
+refs/heads/master: 80b6850e34957d95b7606da01d229dc1e3e6e5b5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/parse/parser.rs

@@ -472,7 +472,19 @@ class parser {
             ty_rec(elems)
         } else if self.token == token::LBRACKET {
             self.expect(token::LBRACKET);
-            let t = ty_vec(self.parse_mt());
+            let mut t = ty_vec(self.parse_mt());
+
+            // Parse the `* 3` in `[ int * 3 ]`
+            match self.maybe_parse_fixed_vstore_with_star() {
+                none => {}
+                some(suffix) => {
+                    t = ty_fixed_length(@{
+                        id: self.get_id(),
+                        node: t,
+                        span: mk_sp(lo, self.last_span.hi)
+                    }, suffix)
+                }
+            }
             self.expect(token::RBRACKET);
             t
         } else if self.token == token::BINOP(token::AND) {
@@ -609,6 +621,22 @@ class parser {
         }
     }
 
+    fn maybe_parse_fixed_vstore_with_star() -> option<option<uint>> {
+        if self.eat(token::BINOP(token::STAR)) {
+            match copy self.token {
+              token::UNDERSCORE => {
+                self.bump(); some(none)
+              }
+              token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => {
+                self.bump(); some(some(i as uint))
+              }
+              _ => none
+            }
+        } else {
+            none
+        }
+    }
+
     fn lit_from_token(tok: token::token) -> lit_ {
         match tok {
           token::LIT_INT(i, it) => lit_int(i, it),

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

@@ -0,0 +1,5 @@
+fn main() {
+    let x: [int*4] = [1, 2, 3, 4];
+    io::println(fmt!("%d", x[0]));
+}
+