rustc: Max/min classes: Add struct literal syntax

pcwalton · pcwalton · commit df4db83ed840 · 2012-07-23T16:40:05.000-07:00
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -343,6 +343,11 @@ enum expr_ {
     expr_assert(@expr),
 
     expr_mac(mac),
+
+    // A struct literal expression.
+    //
+    // XXX: Add functional record update.
+    expr_struct(@path, ~[field])
 }
 
 #[auto_serialize]
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
@@ -467,6 +467,9 @@ fn noop_fold_expr(e: expr_, fld: ast_fold) -> expr_ {
                                         fld.fold_expr(e)) }
           expr_assert(e) { expr_assert(fld.fold_expr(e)) }
           expr_mac(mac) { expr_mac(fold_mac(mac)) }
+          expr_struct(path, fields) {
+            expr_struct(fld.fold_path(path), vec::map(fields, fold_field))
+          }
         }
 }
 
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -30,33 +30,31 @@ import ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
              expr_fail, expr_field, expr_fn, expr_fn_block, expr_if,
              expr_index, expr_lit, expr_log, expr_loop,
              expr_loop_body, expr_mac, expr_move, expr_new, expr_path,
-             expr_rec, expr_ret, expr_swap, expr_tup, expr_unary, expr_vec,
-             expr_vstore, expr_while, extern_fn, field, fn_decl, foreign_item,
-             foreign_item_fn, foreign_mod, ident, impure_fn, infer,
-             init_assign, init_move, initializer, instance_var, item, item_,
-             item_class, item_const, item_enum, item_fn, item_foreign_mod,
-             item_impl, item_mac, item_mod, item_trait, item_ty, lit, lit_,
-             lit_bool, lit_float, lit_int, lit_int_unsuffixed, lit_nil,
-             lit_str, lit_uint, local, m_const, m_imm, m_mutbl, mac_, mac_aq,
-             mac_ellipsis, mac_embed_block, mac_embed_type, mac_invoc,
-             mac_invoc_tt, mac_var, matcher, method, mode, mt, mtc_bb,
-             mtc_rep, mtc_tok, mul, mutability, neg, noreturn, not, pat,
-             pat_box, pat_enum, pat_ident, pat_lit, pat_range, pat_rec,
-             pat_tup, pat_uniq, pat_wild, path, private, proto, proto_any,
-             proto_bare, proto_block, proto_box, proto_uniq, provided, public,
-             pure_fn, purity, re_anon, re_named, region, rem, required,
-             ret_style, return_val, shl, shr, stmt, stmt_decl, stmt_expr,
-             stmt_semi, subtract, token_tree, trait_method, trait_ref,
-             tt_delim, tt_dotdotdot, tt_flat, tt_interpolate, ty, ty_, ty_bot,
-             ty_box, ty_field, ty_fn,
-             ty_infer, ty_mac, ty_method, ty_nil, ty_param, ty_path, ty_ptr,
-             ty_rec, ty_rptr, ty_tup, ty_u32, ty_uniq, ty_vec,
-             ty_fixed_length,
-             unchecked_blk, uniq, unsafe_blk, unsafe_fn, variant, view_item,
-             view_item_, view_item_export, view_item_import, view_item_use,
-             view_path, view_path_glob, view_path_list, view_path_simple,
-             visibility, vstore, vstore_box, vstore_fixed, vstore_slice,
-             vstore_uniq};
+             expr_rec, expr_ret, expr_swap, expr_struct, expr_tup, expr_unary,
+             expr_vec, expr_vstore, expr_while, extern_fn, field, fn_decl,
+             foreign_item, foreign_item_fn, foreign_mod, ident, impure_fn,
+             infer, init_assign, init_move, initializer, instance_var, item,
+             item_, item_class, item_const, item_enum, item_fn,
+             item_foreign_mod, item_impl, item_mac, item_mod, item_trait,
+             item_ty, lit, lit_, lit_bool, lit_float, lit_int,
+             lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local, m_const,
+             m_imm, m_mutbl, mac_, mac_aq, mac_ellipsis, mac_embed_block,
+             mac_embed_type, mac_invoc, mac_invoc_tt, mac_var, matcher,
+             method, mode, mt, mtc_bb, mtc_rep, mtc_tok, mul, mutability, neg,
+             noreturn, not, pat, pat_box, pat_enum, pat_ident, pat_lit,
+             pat_range, pat_rec, pat_tup, pat_uniq, pat_wild, path, private,
+             proto, proto_any, proto_bare, proto_block, proto_box, proto_uniq,
+             provided, public, pure_fn, purity, re_anon, re_named, region,
+             rem, required, ret_style, return_val, shl, shr, stmt, stmt_decl,
+             stmt_expr, stmt_semi, subtract, token_tree, trait_method,
+             trait_ref, tt_delim, tt_dotdotdot, tt_flat, tt_interpolate, ty,
+             ty_, ty_bot, ty_box, ty_field, ty_fn, ty_infer, ty_mac,
+             ty_method, ty_nil, ty_param, ty_path, ty_ptr, ty_rec, ty_rptr,
+             ty_tup, ty_u32, ty_uniq, ty_vec, ty_fixed_length, unchecked_blk,
+             uniq, unsafe_blk, unsafe_fn, variant, view_item, view_item_,
+             view_item_export, view_item_import, view_item_use, view_path,
+             view_path_glob, view_path_list, view_path_simple, visibility,
+             vstore, vstore_box, vstore_fixed, vstore_slice, vstore_uniq};
 
 export file_type;
 export parser;
@@ -912,10 +910,37 @@ class parser {
                 let hi = self.span.hi;
 
                 ret pexpr(self.mk_mac_expr(lo, hi, mac_invoc_tt(pth, tts)));
-            } else {
-                hi = pth.span.hi;
-                ex = expr_path(pth);
+            } else if self.token == token::LBRACE {
+                // This might be a struct literal.
+                let lookahead = self.look_ahead(1);
+                if self.token_is_keyword(~"mut", lookahead) ||
+                        (is_plain_ident(lookahead) &&
+                         self.look_ahead(2) == token::COLON) {
+
+                    // It's a struct literal.
+                    self.bump();
+                    let mut fields = ~[];
+                    if self.is_keyword(~"mut") || is_plain_ident(self.token)
+                            && self.look_ahead(1) == token::COLON {
+                        vec::push(fields, self.parse_field(token::COLON));
+                        while self.token != token::RBRACE {
+                            self.expect(token::COMMA);
+                            if self.token == token::RBRACE {
+                                // Accept an optional trailing comma.
+                                break;
+                            }
+                            vec::push(fields, self.parse_field(token::COLON));
+                        }
+                    }
+
+                    hi = pth.span.hi;
+                    ex = expr_struct(pth, fields);
+                    ret self.mk_pexpr(lo, hi, ex);
+                }
             }
+
+            hi = pth.span.hi;
+            ex = expr_path(pth);
         } else {
             let lit = self.parse_lit();
             hi = lit.span.hi;
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -873,6 +873,16 @@ fn print_vstore(s: ps, t: ast::vstore) {
 }
 
 fn print_expr(s: ps, &&expr: @ast::expr) {
+    fn print_field(s: ps, field: ast::field) {
+        ibox(s, indent_unit);
+        if field.node.mutbl == ast::m_mutbl { word_nbsp(s, ~"mut"); }
+        word(s.s, *field.node.ident);
+        word_space(s, ~":");
+        print_expr(s, field.node.expr);
+        end(s);
+    }
+    fn get_span(field: ast::field) -> codemap::span { ret field.span; }
+
     maybe_print_comment(s, expr.span.lo);
     ibox(s, indent_unit);
     let ann_node = node_expr(s, expr);
@@ -903,15 +913,6 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
         end(s);
       }
       ast::expr_rec(fields, wth) {
-        fn print_field(s: ps, field: ast::field) {
-            ibox(s, indent_unit);
-            if field.node.mutbl == ast::m_mutbl { word_nbsp(s, ~"mut"); }
-            word(s.s, *field.node.ident);
-            word_space(s, ~":");
-            print_expr(s, field.node.expr);
-            end(s);
-        }
-        fn get_span(field: ast::field) -> codemap::span { ret field.span; }
         word(s.s, ~"{");
         commasep_cmnt(s, consistent, fields, print_field, get_span);
         alt wth {
@@ -926,6 +927,13 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
         }
         word(s.s, ~"}");
       }
+      ast::expr_struct(path, fields) {
+        print_path(s, path, true);
+        word(s.s, ~"{");
+        commasep_cmnt(s, consistent, fields, print_field, get_span);
+        word(s.s, ~",");
+        word(s.s, ~"}");
+      }
       ast::expr_tup(exprs) {
         popen(s);
         commasep_exprs(s, inconsistent, exprs);
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
@@ -368,6 +368,10 @@ fn visit_expr<E>(ex: @expr, e: E, v: vt<E>) {
         for flds.each |f| { v.visit_expr(f.node.expr, e, v); }
         visit_expr_opt(base, e, v);
       }
+      expr_struct(p, flds) {
+        visit_path(p, e, v);
+        for flds.each |f| { v.visit_expr(f.node.expr, e, v); }
+      }
       expr_tup(elts) { for elts.each |el| { v.visit_expr(el, e, v); } }
       expr_call(callee, args, _) {
         visit_exprs(args, e, v);
diff --git a/src/rustc/middle/borrowck/categorization.rs b/src/rustc/middle/borrowck/categorization.rs
@@ -175,7 +175,7 @@ impl public_methods for borrowck_ctxt {
           ast::expr_new(*) | ast::expr_binary(*) | ast::expr_while(*) |
           ast::expr_block(*) | ast::expr_loop(*) | ast::expr_alt(*) |
           ast::expr_lit(*) | ast::expr_break | ast::expr_mac(*) |
-          ast::expr_again | ast::expr_rec(*) {
+          ast::expr_again | ast::expr_rec(*) | ast::expr_struct(*) {
             ret self.cat_rvalue(expr, expr_ty);
           }
         }
diff --git a/src/rustc/middle/liveness.rs b/src/rustc/middle/liveness.rs
@@ -471,7 +471,7 @@ fn visit_expr(expr: @expr, &&self: @ir_maps, vt: vt<@ir_maps>) {
       expr_unary(*) | expr_fail(*) |
       expr_break | expr_again | expr_lit(_) | expr_ret(*) |
       expr_block(*) | expr_move(*) | expr_assign(*) | expr_swap(*) |
-      expr_assign_op(*) | expr_mac(*) {
+      expr_assign_op(*) | expr_mac(*) | expr_struct(*) {
           visit::visit_expr(expr, self, vt);
       }
     }
@@ -1064,6 +1064,12 @@ class liveness {
             }
           }
 
+          expr_struct(_, fields) {
+            do fields.foldr(succ) |field, succ| {
+                self.propagate_through_expr(field.node.expr, succ)
+            }
+          }
+
           expr_call(f, args, _) {
             // calling a fn with bot return type means that the fn
             // will fail, and hence the successors can be ignored
@@ -1455,7 +1461,8 @@ fn check_expr(expr: @expr, &&self: @liveness, vt: vt<@liveness>) {
       expr_loop_body(*) | expr_do_body(*) |
       expr_cast(*) | expr_unary(*) | expr_fail(*) |
       expr_ret(*) | expr_break | expr_again | expr_lit(_) |
-      expr_block(*) | expr_swap(*) | expr_mac(*) | expr_addr_of(*) {
+      expr_block(*) | expr_swap(*) | expr_mac(*) | expr_addr_of(*) |
+      expr_struct(*) {
         visit::visit_expr(expr, self, vt);
       }
     }
diff --git a/src/rustc/middle/trans/type_use.rs b/src/rustc/middle/trans/type_use.rs
@@ -155,7 +155,7 @@ fn mark_for_expr(cx: ctx, e: @expr) {
     alt e.node {
       expr_vstore(_, _) |
       expr_vec(_, _) |
-      expr_rec(_, _) | expr_tup(_) |
+      expr_rec(_, _) | expr_struct(*) | expr_tup(_) |
       expr_unary(box(_), _) | expr_unary(uniq(_), _) |
       expr_binary(add, _, _) |
       expr_copy(_) | expr_move(_, _) {
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
@@ -1628,6 +1628,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
           }
         }
       }
+      ast::expr_struct(*) {
+        fail ~"XXX structs";
+      }
       ast::expr_field(base, field, tys) {
         bot = check_field(fcx, expr, false, base, field, tys);
       }

Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,9 @@ fn noop_fold_expr(e: expr_, fld: ast_fold) -> expr_ {`
`467`	`467`	`fld.fold_expr(e)) }`
`468`	`468`	`expr_assert(e) { expr_assert(fld.fold_expr(e)) }`
`469`	`469`	`expr_mac(mac) { expr_mac(fold_mac(mac)) }`
	`470`	`+ expr_struct(path, fields) {`
	`471`	`+ expr_struct(fld.fold_path(path), vec::map(fields, fold_field))`
	`472`	`+ }`
`470`	`473`	`}`
`471`	`474`	`}`
`472`	`475`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ impl public_methods for borrowck_ctxt {`
`175`	`175`	`ast::expr_new() \| ast::expr_binary() \| ast::expr_while(*) \|`
`176`	`176`	`ast::expr_block() \| ast::expr_loop() \| ast::expr_alt(*) \|`
`177`	`177`	`ast::expr_lit() \| ast::expr_break \| ast::expr_mac() \|`
`178`		`- ast::expr_again \| ast::expr_rec(*) {`
	`178`	`+ ast::expr_again \| ast::expr_rec() \| ast::expr_struct() {`
`179`	`179`	`ret self.cat_rvalue(expr, expr_ty);`
`180`	`180`	`}`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ fn visit_expr(expr: @expr, &&self: @ir_maps, vt: vt<@ir_maps>) {`
`471`	`471`	`expr_unary() \| expr_fail() \|`
`472`	`472`	`expr_break \| expr_again \| expr_lit(_) \| expr_ret(*) \|`
`473`	`473`	`expr_block() \| expr_move() \| expr_assign() \| expr_swap() \|`
`474`		`- expr_assign_op() \| expr_mac() {`
	`474`	`+ expr_assign_op() \| expr_mac() \| expr_struct(*) {`
`475`	`475`	`visit::visit_expr(expr, self, vt);`
`476`	`476`	`}`
`477`	`477`	`}`
`@@ -1064,6 +1064,12 @@ class liveness {`
`1064`	`1064`	`}`
`1065`	`1065`	`}`
`1066`	`1066`
	`1067`	`+ expr_struct(_, fields) {`
	`1068`	`+ do fields.foldr(succ) \|field, succ\| {`
	`1069`	`+ self.propagate_through_expr(field.node.expr, succ)`
	`1070`	`+ }`
	`1071`	`+ }`
	`1072`	`+`
`1067`	`1073`	`expr_call(f, args, _) {`
`1068`	`1074`	`// calling a fn with bot return type means that the fn`
`1069`	`1075`	`// will fail, and hence the successors can be ignored`
`@@ -1455,7 +1461,8 @@ fn check_expr(expr: @expr, &&self: @liveness, vt: vt<@liveness>) {`
`1455`	`1461`	`expr_loop_body() \| expr_do_body() \|`
`1456`	`1462`	`expr_cast() \| expr_unary() \| expr_fail(*) \|`
`1457`	`1463`	`expr_ret(*) \| expr_break \| expr_again \| expr_lit(_) \|`
`1458`		`- expr_block() \| expr_swap() \| expr_mac() \| expr_addr_of() {`
	`1464`	`+ expr_block() \| expr_swap() \| expr_mac() \| expr_addr_of() \|`
	`1465`	`+ expr_struct(*) {`
`1459`	`1466`	`visit::visit_expr(expr, self, vt);`
`1460`	`1467`	`}`
`1461`	`1468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1628,6 +1628,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,`
`1628`	`1628`	`}`
`1629`	`1629`	`}`
`1630`	`1630`	`}`
	`1631`	`+ ast::expr_struct(*) {`
	`1632`	`+ fail ~"XXX structs";`
	`1633`	`+ }`
`1631`	`1634`	`ast::expr_field(base, field, tys) {`
`1632`	`1635`	`bot = check_field(fcx, expr, false, base, field, tys);`
`1633`	`1636`	`}`