Skip to content

Commit

Permalink
Added a functioning version of the assoc-oddities-3 test case to
Browse files Browse the repository at this point in the history
run-pass.  Added run-pass/issue-28777 to demonstrate behavior of
this parsing modification.
  • Loading branch information
aaronkeen committed Dec 17, 2015
1 parent ae47972 commit cedd794
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/test/run-pass/assoc-oddities-3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2015 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.

fn that_odd_parse(c: bool, n: usize) -> u32 {
let x = 2;
let a = [1, 2, 3, 4];
let b = [5, 6, 7, 7];
x + if c { a } else { b }[n]
}

fn main() {
assert_eq!(4, that_odd_parse(true, 1));
assert_eq!(8, that_odd_parse(false, 1));
}
30 changes: 30 additions & 0 deletions src/test/run-pass/issue-28777.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2015 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.

fn main() {
let v1 = { 1 + {2} * {3} };
let v2 = 1 + {2} * {3} ;

assert_eq!(7, v1);
assert_eq!(7, v2);

let v3;
v3 = { 1 + {2} * {3} };
let v4;
v4 = 1 + {2} * {3};
assert_eq!(7, v3);
assert_eq!(7, v4);

let v5 = { 1 + {2} * 3 };
assert_eq!(7, v5);

let v9 = { 1 + if 1 > 2 {1} else {2} * {3} };
assert_eq!(7, v9);
}

0 comments on commit cedd794

Please sign in to comment.