diff options
| author | Lindsey Kuper <[email protected]> | 2011-05-10 19:52:22 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-05-13 17:35:13 -0700 |
| commit | 6c1c5b39482158f078b5b10164c024edf345e386 (patch) | |
| tree | 7c179784c98b97df43ff2329c96940452934f7b4 /src/comp/middle/ty.rs | |
| parent | Correct capitalization of "Option". (diff) | |
| download | rust-6c1c5b39482158f078b5b10164c024edf345e386.tar.xz rust-6c1c5b39482158f078b5b10164c024edf345e386.zip | |
More progress on anonymous objects.
Still segfaulting on the method-overriding.rs test, though.
Diffstat (limited to 'src/comp/middle/ty.rs')
| -rw-r--r-- | src/comp/middle/ty.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index a0c3a724..fcde5e2c 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -1659,6 +1659,7 @@ fn pat_ty(&ctxt cx, &node_type_table ntt, &@ast::pat pat) -> t { fail; // not reached } +<<<<<<< HEAD fn expr_ann(&@ast::expr e) -> ast::ann { alt (e.node) { case (ast::expr_vec(_,_,?a)) { ret a; } @@ -1694,6 +1695,7 @@ fn expr_ann(&@ast::expr e) -> ast::ann { case (ast::expr_check(_,?a)) { ret a; } case (ast::expr_port(?a)) { ret a; } case (ast::expr_chan(_,?a)) { ret a; } + case (ast::expr_anon_obj(_,_,_,?a)) { ret a; } case (ast::expr_break(?a)) { ret a; } case (ast::expr_cont(?a)) { ret a; } case (ast::expr_self_method(_, ?a)) { ret a; } |