@@ -30,33 +30,31 @@ import ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
30
30
expr_fail, expr_field, expr_fn, expr_fn_block, expr_if,
31
31
expr_index, expr_lit, expr_log, expr_loop,
32
32
expr_loop_body, expr_mac, expr_move, expr_new, expr_path,
33
- expr_rec, expr_ret, expr_swap, expr_tup, expr_unary, expr_vec,
34
- expr_vstore, expr_while, extern_fn, field, fn_decl, foreign_item,
35
- foreign_item_fn, foreign_mod, ident, impure_fn, infer,
36
- init_assign, init_move, initializer, instance_var, item, item_,
37
- item_class, item_const, item_enum, item_fn, item_foreign_mod,
38
- item_impl, item_mac, item_mod, item_trait, item_ty, lit, lit_,
39
- lit_bool, lit_float, lit_int, lit_int_unsuffixed, lit_nil,
40
- lit_str, lit_uint, local, m_const, m_imm, m_mutbl, mac_, mac_aq,
41
- mac_ellipsis, mac_embed_block, mac_embed_type, mac_invoc,
42
- mac_invoc_tt, mac_var, matcher, method, mode, mt, mtc_bb,
43
- mtc_rep, mtc_tok, mul, mutability, neg, noreturn, not, pat,
44
- pat_box, pat_enum, pat_ident, pat_lit, pat_range, pat_rec,
45
- pat_tup, pat_uniq, pat_wild, path, private, proto, proto_any,
46
- proto_bare, proto_block, proto_box, proto_uniq, provided, public,
47
- pure_fn, purity, re_anon, re_named, region, rem, required,
48
- ret_style, return_val, shl, shr, stmt, stmt_decl, stmt_expr,
49
- stmt_semi, subtract, token_tree, trait_method, trait_ref,
50
- tt_delim, tt_dotdotdot, tt_flat, tt_interpolate, ty, ty_, ty_bot,
51
- ty_box, ty_field, ty_fn,
52
- ty_infer, ty_mac, ty_method, ty_nil, ty_param, ty_path, ty_ptr,
53
- ty_rec, ty_rptr, ty_tup, ty_u32, ty_uniq, ty_vec,
54
- ty_fixed_length,
55
- unchecked_blk, uniq, unsafe_blk, unsafe_fn, variant, view_item,
56
- view_item_, view_item_export, view_item_import, view_item_use,
57
- view_path, view_path_glob, view_path_list, view_path_simple,
58
- visibility, vstore, vstore_box, vstore_fixed, vstore_slice,
59
- vstore_uniq} ;
33
+ expr_rec, expr_ret, expr_swap, expr_struct, expr_tup, expr_unary,
34
+ expr_vec, expr_vstore, expr_while, extern_fn, field, fn_decl,
35
+ foreign_item, foreign_item_fn, foreign_mod, ident, impure_fn,
36
+ infer, init_assign, init_move, initializer, instance_var, item,
37
+ item_, item_class, item_const, item_enum, item_fn,
38
+ item_foreign_mod, item_impl, item_mac, item_mod, item_trait,
39
+ item_ty, lit, lit_, lit_bool, lit_float, lit_int,
40
+ lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local, m_const,
41
+ m_imm, m_mutbl, mac_, mac_aq, mac_ellipsis, mac_embed_block,
42
+ mac_embed_type, mac_invoc, mac_invoc_tt, mac_var, matcher,
43
+ method, mode, mt, mtc_bb, mtc_rep, mtc_tok, mul, mutability, neg,
44
+ noreturn, not, pat, pat_box, pat_enum, pat_ident, pat_lit,
45
+ pat_range, pat_rec, pat_tup, pat_uniq, pat_wild, path, private,
46
+ proto, proto_any, proto_bare, proto_block, proto_box, proto_uniq,
47
+ provided, public, pure_fn, purity, re_anon, re_named, region,
48
+ rem, required, ret_style, return_val, shl, shr, stmt, stmt_decl,
49
+ stmt_expr, stmt_semi, subtract, token_tree, trait_method,
50
+ trait_ref, tt_delim, tt_dotdotdot, tt_flat, tt_interpolate, ty,
51
+ ty_, ty_bot, ty_box, ty_field, ty_fn, ty_infer, ty_mac,
52
+ ty_method, ty_nil, ty_param, ty_path, ty_ptr, ty_rec, ty_rptr,
53
+ ty_tup, ty_u32, ty_uniq, ty_vec, ty_fixed_length, unchecked_blk,
54
+ uniq, unsafe_blk, unsafe_fn, variant, view_item, view_item_,
55
+ view_item_export, view_item_import, view_item_use, view_path,
56
+ view_path_glob, view_path_list, view_path_simple, visibility,
57
+ vstore, vstore_box, vstore_fixed, vstore_slice, vstore_uniq} ;
60
58
61
59
export file_type;
62
60
export parser;
@@ -912,10 +910,37 @@ class parser {
912
910
let hi = self.span.hi;
913
911
914
912
ret pexpr(self.mk_mac_expr(lo, hi, mac_invoc_tt(pth, tts)));
915
- } else {
916
- hi = pth.span.hi;
917
- ex = expr_path(pth);
913
+ } else if self.token == token::LBRACE {
914
+ // This might be a struct literal.
915
+ let lookahead = self.look_ahead(1);
916
+ if self.token_is_keyword(~" mut ", lookahead) ||
917
+ (is_plain_ident(lookahead) &&
918
+ self.look_ahead(2) == token::COLON) {
919
+
920
+ // It's a struct literal.
921
+ self.bump();
922
+ let mut fields = ~[];
923
+ if self.is_keyword(~" mut ") || is_plain_ident(self.token)
924
+ && self.look_ahead(1) == token::COLON {
925
+ vec::push(fields, self.parse_field(token::COLON));
926
+ while self.token != token::RBRACE {
927
+ self.expect(token::COMMA);
928
+ if self.token == token::RBRACE {
929
+ // Accept an optional trailing comma.
930
+ break;
931
+ }
932
+ vec::push(fields, self.parse_field(token::COLON));
933
+ }
934
+ }
935
+
936
+ hi = pth.span.hi;
937
+ ex = expr_struct(pth, fields);
938
+ ret self.mk_pexpr(lo, hi, ex);
939
+ }
918
940
}
941
+
942
+ hi = pth.span.hi;
943
+ ex = expr_path(pth);
919
944
} else {
920
945
let lit = self.parse_lit();
921
946
hi = lit.span.hi;
0 commit comments