---

yaml
---
r: 50810
b: refs/heads/try
c: ab8e46b
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 99ac243e7b789b54231e4607aa775174c7c3995a
+refs/heads/try: ab8e46b0660e076e629e6775ed8da9890c5fbf1f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/trans/callee.rs

@@ -492,14 +492,12 @@ pub fn trans_call_inner(
             }
         };
 
-        let llretslot = trans_ret_slot(bcx, fn_expr_ty, dest);
-
-        let mut llargs = ~[];
-        llargs.push(llretslot);
-        llargs.push(llenv);
-        bcx = trans_args(bcx, args, fn_expr_ty,
-                         ret_flag, autoref_arg, &mut llargs);
+        let args_res = trans_args(bcx, llenv, args, fn_expr_ty,
+                                  dest, ret_flag, autoref_arg);
+        bcx = args_res.bcx;
+        let mut llargs = /*bad*/copy args_res.args;
 
+        let llretslot = args_res.retslot;
 
         // Now that the arguments have finished evaluating, we need to revoke
         // the cleanup for the self argument, if it exists
@@ -557,12 +555,30 @@ pub enum CallArgs {
     ArgVals(&'self [ValueRef])
 }
 
-pub fn trans_ret_slot(+bcx: block,
-                      +fn_ty: ty::t,
-                      +dest: expr::Dest) -> ValueRef
-{
+pub struct Args {
+    bcx: block,
+    args: ~[ValueRef],
+    retslot: ValueRef
+}
+
+pub fn trans_args(cx: block,
+                  llenv: ValueRef,
+                  +args: CallArgs,
+                  fn_ty: ty::t,
+                  dest: expr::Dest,
+                  ret_flag: Option<ValueRef>,
+                  +autoref_arg: AutorefArg) -> Args {
+    let _icx = cx.insn_ctxt("trans_args");
+    let mut temp_cleanups = ~[];
+    let arg_tys = ty::ty_fn_args(fn_ty);
+    let mut llargs: ~[ValueRef] = ~[];
+
+    let mut bcx = cx;
+
     let retty = ty::ty_fn_ret(fn_ty);
-    match dest {
+
+    // Arg 0: Output pointer.
+    let llretslot = match dest {
         expr::SaveIn(dst) => dst,
         expr::Ignore => {
             if ty::type_is_nil(retty) {
@@ -573,21 +589,13 @@ pub fn trans_ret_slot(+bcx: block,
                 alloc_ty(bcx, retty)
             }
         }
-    }
-}
+    };
+    llargs.push(llretslot);
 
-pub fn trans_args(+cx: block,
-                  +args: CallArgs,
-                  +fn_ty: ty::t,
-                  +ret_flag: Option<ValueRef>,
-                  +autoref_arg: AutorefArg,
-                  +llargs: &mut ~[ValueRef]) -> block
-{
-    let _icx = cx.insn_ctxt("trans_args");
-    let mut temp_cleanups = ~[];
-    let arg_tys = ty::ty_fn_args(fn_ty);
+    // Arg 1: Env (closure-bindings / self value)
+    llargs.push(llenv);
 
-    let mut bcx = cx;
+    // ... then explicit args.
 
     // First we figure out the caller's view of the types of the arguments.
     // This will be needed if this is a generic call, because the callee has
@@ -616,7 +624,7 @@ pub fn trans_args(+cx: block,
         revoke_clean(bcx, *c)
     }
 
-    return bcx;
+    Args { bcx: bcx, args: llargs, retslot: llretslot }
 }
 
 pub enum AutorefArg {

branches/try/src/libsyntax/ext/expand.rs

@@ -464,6 +464,15 @@ pub fn core_macros() -> ~str {
         }
     )
 
+    macro_rules! assert_eq (
+        ($given:expr , $expected:expr) =>
+        ({let given_val = $given;
+          let expected_val = $expected;
+          // check both directions of equality....
+          if !((given_val == expected_val) && (expected_val == given_val)) {
+            fail!(fmt!(\"expected: %?, given: %?\",expected_val,given_val));
+        }}))
+
     macro_rules! condition (
 
         { $c:ident: $in:ty -> $out:ty; } => {
@@ -481,6 +490,7 @@ pub fn core_macros() -> ~str {
         }
     )
 
+
 }";
 }
 

branches/try/src/test/run-fail/assert-eq-macro-fail.rs

@@ -0,0 +1,8 @@
+// error-pattern:expected: 15, given: 14
+
+#[deriving_eq]
+struct Point { x : int }
+
+fn main() {
+    assert_eq!(14,15);
+}

branches/try/src/test/run-pass/assert-eq-macro-success.rs

@@ -0,0 +1,10 @@
+#[deriving_eq]
+struct Point { x : int }
+
+fn main() {
+    assert_eq!(14,14);
+    assert_eq!(~"abc",~"abc");
+    assert_eq!(~Point{x:34},~Point{x:34});
+    assert_eq!(&Point{x:34},&Point{x:34});
+    assert_eq!(@Point{x:34},@Point{x:34});
+}