From aad0bcc8d5e1ed9cf6ca0eedae21b3aa0c67ab16 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 6 Jul 2011 15:53:47 -0700
Subject: rustc: Make AST tuple types use interior vectors

---
 src/comp/syntax/ast.rs          | 2 +-
 src/comp/syntax/parse/parser.rs | 4 ++--
 src/comp/syntax/print/pprust.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/comp/syntax')

diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs
index 0258472042e..f785a00a69c 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/comp/syntax/ast.rs
@@ -401,7 +401,7 @@ tag ty_ {
     ty_task;
     ty_port(@ty);
     ty_chan(@ty);
-    ty_tup(vec[mt]);
+    ty_tup(mt[]);
     ty_rec(vec[ty_field]);
     ty_fn(proto, vec[ty_arg], @ty, controlflow, vec[@constr]);
     ty_obj(vec[ty_method]);
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 8923588dba4..ae102027f0a 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -520,8 +520,8 @@ fn parse_ty(&parser p) -> @ast::ty {
         expect(p, token::RBRACKET);
     } else if (eat_word(p, "tup")) {
         auto elems =
-            parse_seq(token::LPAREN, token::RPAREN, some(token::COMMA),
-                      parse_mt, p);
+            parse_seq_ivec(token::LPAREN, token::RPAREN, some(token::COMMA),
+                           parse_mt, p);
         hi = elems.span.hi;
         t = ast::ty_tup(elems.node);
     } else if (eat_word(p, "rec")) {
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index ec9d6316f72..83f27f7560f 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -301,7 +301,7 @@ fn print_type(&ps s, &ast::ty ty) {
         case (ast::ty_tup(?elts)) {
             word(s.s, "tup");
             popen(s);
-            commasep(s, inconsistent, elts, print_mt);
+            commasep_ivec(s, inconsistent, elts, print_mt);
             pclose(s);
         }
         case (ast::ty_rec(?fields)) {
-- 
cgit 1.4.1-3-g733a5