rustc: Add the safe address-of operator to the AST

Author: pcwalton

src/rustc/metadata/astencode_gen.rs

@@ -1393,6 +1393,7 @@ fn serialize_81<S: std::serialization::serializer>(s: S,
                 /*syntax::ast::mutability*/
 
 
+
                 {||
                     alt v {
                       syntax::ast::box(v0) {
@@ -1429,6 +1430,10 @@ fn serialize_81<S: std::serialization::serializer>(s: S,
                       syntax::ast::neg {
                         s.emit_enum_variant("syntax::ast::neg", 4u, 0u, {|| })
                       }
+                      syntax::ast::addr_of {
+                        s.emit_enum_variant("syntax::ast::addr_of", 5u, 0u,
+                                            {|| })
+                      }
                     }
                 });
 }
@@ -5543,6 +5548,8 @@ fn deserialize_81<S: std::serialization::deserializer>(s: S) ->
 
 
 
+
+
                 {||
                     s.read_enum_variant({|v_id|
                                             alt check v_id {
@@ -5561,6 +5568,7 @@ fn deserialize_81<S: std::serialization::deserializer>(s: S) ->
                                               2u { syntax::ast::deref }
                                               3u { syntax::ast::not }
                                               4u { syntax::ast::neg }
+                                              5u { syntax::ast::addr_of }
                                             }
                                         })
                 })

src/rustc/middle/trans/base.rs

@@ -1645,6 +1645,9 @@ fn trans_unary(bcx: block, op: ast::unop, e: @ast::expr,
                                translated using trans_lval(), not \
                                trans_unary()");
       }
+      ast::addr_of {
+        bcx.sess().bug("TODO pcwalton");
+      }
     }
 }
 
@@ -4305,7 +4308,8 @@ fn trans_const_expr(cx: crate_ctxt, e: @ast::expr) -> ValueRef {
         ret alt u {
           ast::box(_)  |
           ast::uniq(_) |
-          ast::deref  { cx.sess.span_bug(e.span,
+          ast::deref   |
+          ast::addr_of { cx.sess.span_bug(e.span,
                            "bad unop type in trans_const_expr"); }
           ast::not    { llvm::LLVMConstNot(te) }
           ast::neg    {

src/rustc/middle/typeck.rs

@@ -2186,6 +2186,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
                 oper_t = check_user_unop(fcx, "-", "unary-", expr, oper_t);
             }
           }
+          ast::addr_of {
+            tcx.sess.bug("TODO pcwalton");
+          }
         }
         write_ty(tcx, id, oper_t);
       }

src/rustc/syntax/ast.rs

@@ -159,7 +159,7 @@ enum binop {
 enum unop {
     box(mutability),
     uniq(mutability),
-    deref, not, neg,
+    deref, not, neg, addr_of
 }
 
 // Generally, after typeck you can get the inferred value

src/rustc/syntax/ast_util.rs

@@ -94,6 +94,7 @@ fn unop_to_str(op: unop) -> str {
       deref { ret "*"; }
       not { ret "!"; }
       neg { ret "-"; }
+      addr_of { ret "&"; }
     }
 }