---

yaml
---
r: 47071
b: refs/heads/try
c: 612553c
h: refs/heads/master
i:
  47069: e05efde
  47067: 35a177e
  47063: 32339d8
  47055: 62770f1
  47039: 38a02ee
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: 9939d88e8d76b16a3ca9f6cb567bf363af04ef66
+refs/heads/try: 612553cb3921f428668602afda1b106e0fd54d73
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/parser.rs

@@ -1061,6 +1061,9 @@ pub impl Parser {
 
         if self.token == token::LPAREN {
             self.bump();
+            // (e) is parenthesized e
+            // (e,) is a tuple with only one field, e
+            let mut one_tuple = false;
             if self.token == token::RPAREN {
                 hi = self.span.hi;
                 self.bump();
@@ -1069,12 +1072,18 @@ pub impl Parser {
             }
             let mut es = ~[self.parse_expr()];
             while self.token == token::COMMA {
-                self.bump(); es.push(self.parse_expr());
+                self.bump();
+                if self.token != token::RPAREN {
+                    es.push(self.parse_expr());
+                }
+                else {
+                    one_tuple = true;
+                }
             }
             hi = self.span.hi;
             self.expect(token::RPAREN);
 
-            return if es.len() == 1 {
+            return if es.len() == 1 && !one_tuple {
                 self.mk_expr(lo, self.span.hi, expr_paren(es[0]))
             }
             else {
@@ -2158,11 +2167,13 @@ pub impl Parser {
                 pat = pat_lit(expr);
             } else {
                 let mut fields = ~[self.parse_pat(refutable)];
-                while self.token == token::COMMA {
-                    self.bump();
-                    fields.push(self.parse_pat(refutable));
+                if self.look_ahead(1) != token::RPAREN {
+                    while self.token == token::COMMA {
+                        self.bump();
+                        fields.push(self.parse_pat(refutable));
+                    }
                 }
-                if vec::len(fields) == 1u { self.expect(token::COMMA); }
+                if fields.len() == 1 { self.expect(token::COMMA); }
                 hi = self.span.hi;
                 self.expect(token::RPAREN);
                 pat = pat_tup(fields);

branches/try/src/libsyntax/print/pprust.rs

@@ -1199,6 +1199,9 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) {
       ast::expr_tup(exprs) => {
         popen(s);
         commasep_exprs(s, inconsistent, exprs);
+        if exprs.len() == 1 {
+            word(s.s, ~",");
+        }
         pclose(s);
       }
       ast::expr_call(func, args, sugar) => {
@@ -1634,6 +1637,9 @@ pub fn print_pat(s: @ps, &&pat: @ast::pat, refutable: bool) {
       ast::pat_tup(elts) => {
         popen(s);
         commasep(s, inconsistent, elts, |s, p| print_pat(s, p, refutable));
+        if elts.len() == 1 {
+            word(s.s, ~",");
+        }
         pclose(s);
       }
       ast::pat_box(inner) => {

branches/try/src/test/run-pass/class-impl-very-parameterized-trait.rs

@@ -127,7 +127,7 @@ priv impl<T> cat<T> {
     }
 }
 
-pub fn main() {
+fn main() {
     let mut nyan: cat<~str> = cat::new(0, 2, ~"nyan");
     for uint::range(1, 5) |_| { nyan.speak(); }
     assert(*nyan.find(&1).unwrap() == ~"nyan");

branches/try/src/test/run-pass/const-enum-ptr.rs

@@ -11,7 +11,7 @@
 enum E { V0, V1(int) }
 const C: &static/E = &V0;
 
-pub fn main() {
+fn main() {
     match *C {
         V0 => (),
         _ => fail!()

branches/try/src/test/run-pass/const-enum-struct.rs

@@ -12,7 +12,7 @@ enum E { V16(u16), V32(u32) }
 struct S { a: E, b: u16, c: u16 }
 const C: S = S { a: V16(0xDEAD), b: 0x600D, c: 0xBAD };
 
-pub fn main() {
+fn main() {
     let n = C.b;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-struct2.rs

@@ -12,7 +12,7 @@ enum E { V0, V16(u16) }
 struct S { a: E, b: u16, c: u16 }
 const C: S = S { a: V0, b: 0x600D, c: 0xBAD };
 
-pub fn main() {
+fn main() {
     let n = C.b;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-tuple.rs

@@ -11,7 +11,7 @@
 enum E { V16(u16), V32(u32) }
 const C: (E, u16, u16) = (V16(0xDEAD), 0x600D, 0xBAD);
 
-pub fn main() {
+fn main() {
     let (_, n, _) = C;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-tuple2.rs

@@ -11,7 +11,7 @@
 enum E { V0, V16(u16) }
 const C: (E, u16, u16) = (V0, 0x600D, 0xBAD);
 
-pub fn main() {
+fn main() {
     let (_, n, _) = C;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-tuplestruct.rs

@@ -12,7 +12,7 @@ enum E { V16(u16), V32(u32) }
 struct S(E, u16, u16);
 const C: S = S(V16(0xDEAD), 0x600D, 0xBAD);
 
-pub fn main() {
+fn main() {
     let S(_, n, _) = C;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-tuplestruct2.rs

@@ -12,7 +12,7 @@ enum E { V0, V16(u16) }
 struct S(E, u16, u16);
 const C: S = S(V0, 0x600D, 0xBAD);
 
-pub fn main() {
+fn main() {
     let S(_, n, _) = C;
     assert n != 0xBAD;
     assert n == 0x600D;

branches/try/src/test/run-pass/const-enum-vec-index.rs

@@ -13,7 +13,7 @@ const C: &[E] = &[V0, V1(0xDEADBEE)];
 const C0: E = C[0];
 const C1: E = C[1];
 
-pub fn main() {
+fn main() {
     match C0 { 
         V0 => (),
         _ => fail!()

branches/try/src/test/run-pass/const-enum-vec-ptr.rs

@@ -11,7 +11,7 @@
 enum E { V1(int), V0 }
 const C: &static/[E] = &[V0, V1(0xDEADBEE), V0];
 
-pub fn main() {
+fn main() {
     match C[1] {
         V1(n) => assert(n == 0xDEADBEE),
         _ => fail!()

branches/try/src/test/run-pass/const-enum-vector.rs

@@ -11,7 +11,7 @@
 enum E { V1(int), V0 }
 const C: [E * 3] = [V0, V1(0xDEADBEE), V0];
 
-pub fn main() {
+fn main() {
     match C[1] {
         V1(n) => assert(n == 0xDEADBEE),
         _ => fail!()

branches/try/src/test/run-pass/impl-privacy-xc-1.rs

@@ -3,7 +3,7 @@
 
 extern mod impl_privacy_xc_1;
 
-pub fn main() {
+fn main() {
     let fish = impl_privacy_xc_1::Fish { x: 1 };
     fish.swim();
 }

branches/try/src/test/run-pass/impl-privacy-xc-2.rs

@@ -3,7 +3,7 @@
 
 extern mod impl_privacy_xc_2;
 
-pub fn main() {
+fn main() {
     let fish1 = impl_privacy_xc_2::Fish { x: 1 };
     let fish2 = impl_privacy_xc_2::Fish { x: 2 };
     io::println(if fish1.eq(&fish2) { "yes" } else { "no " });

branches/try/src/test/run-pass/issue-1257.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub fn main () {
+fn main () {
   let mut line = ~"";
   let mut i = 0;
   while line != ~"exit" {

branches/try/src/test/run-pass/newtype-struct-xc-2.rs

@@ -8,7 +8,7 @@ fn f() -> Au {
     Au(2)
 }
 
-pub fn main() {
+fn main() {
     let _ = f();
 }
 

branches/try/src/test/run-pass/newtype-struct-xc.rs

@@ -3,7 +3,7 @@
 
 extern mod newtype_struct_xc;
 
-pub fn main() {
+fn main() {
     let _ = newtype_struct_xc::Au(2);
 }
 

branches/try/src/test/run-pass/one-tuple.rs

@@ -0,0 +1,20 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Why one-tuples? Because macros.
+
+fn main() {
+    match ('c',) {
+        (x,) => {
+            assert x == 'c';
+        }
+    }
+}
+

branches/try/src/test/run-pass/trait-default-method-bound-subst.rs

@@ -20,6 +20,6 @@ fn f<T, U, V: A<T>>(i: V, j: T, k: U) -> (T, U) {
     i.g(j, k)
 }
 
-pub fn main () {
+fn main () {
     assert f(0, 1, 2) == (1, 2);
 }

branches/try/src/test/run-pass/trait-default-method-bound-subst2.rs

@@ -20,6 +20,6 @@ fn f<T, V: A<T>>(i: V, j: T) -> T {
     i.g(j)
 }
 
-pub fn main () {
+fn main () {
     assert f(0, 2) == 2;
 }

branches/try/src/test/run-pass/trait-default-method-bound-subst3.rs

@@ -20,7 +20,7 @@ fn f<T, V: A>(i: V, j: T, k: T) -> (T, T) {
     i.g(j, k)
 }
 
-pub fn main () {
+fn main () {
     assert f(0, 1, 2) == (1, 2);
     assert f(0, 1u8, 2u8) == (1u8, 2u8);
 }

branches/try/src/test/run-pass/trait-default-method-bound-subst4.rs

@@ -20,7 +20,7 @@ fn f<T, V: A<T>>(i: V, j: uint) -> uint {
     i.g(j)
 }
 
-pub fn main () {
+fn main () {
     assert f::<float, int>(0, 2u) == 2u;
     assert f::<uint, int>(0, 2u) == 2u;
 }

branches/try/src/test/run-pass/trait-default-method-bound.rs

@@ -20,6 +20,6 @@ fn f<T: A>(i: T) {
     assert i.g() == 10;
 }
 
-pub fn main () {
+fn main () {
     f(0);
 }