---

yaml
---
r: 29795
b: refs/heads/incoming
c: 80b6850
h: refs/heads/master
i:
  29793: 73d6aa1
  29791: ab7b60c
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 36883186ab88e7b39ea2cb0f47c2c8999840663e
+refs/heads/incoming: 80b6850e34957d95b7606da01d229dc1e3e6e5b5
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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),

branches/incoming/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]));
+}
+