---

yaml
---
r: 31722
b: refs/heads/dist-snap
c: 175be53
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 4be8239ac2fe2209dd4f19279151aa18792e6c4a
+refs/heads/dist-snap: 175be53e3f62664e445a57c2ad9e23f4bcb296b2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/check_const.rs

@@ -103,6 +103,7 @@ fn check_expr(sess: session, def_map: resolve3::DefMap,
           expr_vec(_, m_imm) |
           expr_addr_of(m_imm, _) |
           expr_tup(*) |
+          expr_struct(*) |
           expr_rec(*) => { }
           expr_addr_of(*) => {
                 sess.span_err(

branches/dist-snap/src/rustc/middle/const_eval.rs

@@ -95,6 +95,7 @@ fn classify(e: @expr,
                 }
               }
 
+              ast::expr_struct(_, fs, none) |
               ast::expr_rec(fs, none) => {
                 let cs = do vec::map(fs) |f| {
                     if f.node.mutbl == ast::m_imm {

branches/dist-snap/src/rustc/middle/trans/consts.rs

@@ -153,6 +153,32 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
       ast::expr_tup(es) => {
         C_struct(es.map(|e| const_expr(cx, e)))
       }
+      ast::expr_struct(_, fs, _) => {
+          let ety = ty::expr_ty(cx.tcx, e);
+          let llty = type_of::type_of(cx, ety);
+          let class_fields =
+              match ty::get(ety).struct {
+              ty::ty_class(clsid, _) =>
+                  ty::lookup_class_fields(cx.tcx, clsid),
+              _ =>
+                  cx.tcx.sess.span_bug(e.span,
+                                       ~"didn't resolve to a struct")
+          };
+          let mut cs = ~[];
+          for class_fields.each |class_field| {
+              let mut found = false;
+              for fs.each |field| {
+                  if class_field.ident == field.node.ident  {
+                      found = true;
+                      vec::push(cs, const_expr(cx, field.node.expr));
+                  }
+              }
+              if !found {
+                  cx.tcx.sess.span_bug(e.span, ~"missing struct field");
+              }
+          }
+          C_named_struct(llty, cs)
+      }
       ast::expr_rec(fs, none) => {
         C_struct(fs.map(|f| const_expr(cx, f.node.expr)))
       }

branches/dist-snap/src/test/run-pass/const-struct.rs

@@ -0,0 +1,14 @@
+
+struct foo { a: int; b: int; c: int; }
+
+const x : foo = foo { a:1, b:2, c: 3 };
+const y : foo = foo { b:2, c:3, a: 1 };
+const z : &foo = &foo { a: 10, b: 22, c: 12 };
+
+fn main() {
+    assert x.b == 2;
+    assert x == y;
+    assert z.b == 22;
+    io::println(fmt!{"0x%x", x.b as uint});
+    io::println(fmt!{"0x%x", z.c as uint});
+}