---

yaml
---
r: 7869
b: refs/heads/snap-stage3
c: b80f0a3
h: refs/heads/master
i:
  7867: 3924c8e
v: v3

Author: marijnh

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7b67e2d27406d1bd2173c269b22a6166830357a0
+refs/heads/snap-stage3: b80f0a3c9fe6a0e6d88a95b0697cb64411152530
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/middle/typeck.rs

@@ -1903,7 +1903,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
             oper_t = structurally_resolved_type(fcx, oper.span, oper_t);
             if !(ty::type_is_integral(tcx, oper_t) ||
                  ty::type_is_fp(tcx, oper_t)) {
-                oper_t = check_user_unop(fcx, "-", "neg", expr, oper_t);
+                oper_t = check_user_unop(fcx, "-", "unary-", expr, oper_t);
             }
           }
         }

branches/snap-stage3/src/comp/syntax/parse/parser.rs

@@ -1829,7 +1829,11 @@ fn parse_method_name(p: parser) -> ast::ident {
       token::BINOP(op) { p.bump(); token::binop_to_str(op) }
       token::NOT { p.bump(); "!" }
       token::LBRACKET { p.bump(); expect(p, token::RBRACKET); "[]" }
-      _ { parse_value_ident(p) }
+      _ {
+          let id = parse_value_ident(p);
+          if id == "unary" && eat(p, token::BINOP(token::MINUS)) { "unary-" }
+          else { id }
+      }
     }
 }
 

branches/snap-stage3/src/test/run-pass/operator-overloading.rs

@@ -7,7 +7,7 @@ impl point_ops for point {
     fn -(other: point) -> point {
         {x: self.x - other.x, y: self.y - other.y}
     }
-    fn neg() -> point {
+    fn unary-() -> point {
         {x: -self.x, y: -self.y}
     }
     fn [](x: bool) -> int {