---

yaml
---
r: 33775
b: refs/heads/snap-stage3
c: a7aecc4
h: refs/heads/master
i:
  33773: 7d9cbc8
  33771: e74181f
  33767: 3ef6424
  33759: 7e2a638
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8f22582e9f05c1ba36b25ad468ac75f8793f5011
+refs/heads/snap-stage3: a7aecc46a517c4cac0a63ffcdb2e87ebff77e281
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/ext/base.rs

@@ -97,6 +97,9 @@ fn syntax_expander_table() -> HashMap<~str, syntax_extension> {
                                 ext::log_syntax::expand_syntax_ext));
     syntax_expanders.insert(~"ast",
                             builtin(ext::qquote::expand_ast));
+    syntax_expanders.insert(~"deriving_eq",
+                            item_decorator(
+                                ext::deriving::expand_deriving_eq));
 
     // Quasi-quoting expanders
     syntax_expanders.insert(~"quote_tokens",

branches/snap-stage3/src/libsyntax/ext/build.rs

@@ -136,9 +136,29 @@ fn mk_block(cx: ext_ctxt, sp: span,
                span: sp };
     mk_expr(cx, sp, ast::expr_block(blk))
 }
+fn mk_simple_block(cx: ext_ctxt, span: span, expr: @ast::expr) -> ast::blk {
+    let block = {
+        view_items: ~[],
+        stmts: ~[],
+        expr: Some(expr),
+        id: cx.next_id(),
+        rules: ast::default_blk
+    };
+    { node: move block, span: span }
+}
 fn mk_copy(cx: ext_ctxt, sp: span, e: @ast::expr) -> @ast::expr {
     mk_expr(cx, sp, ast::expr_copy(e))
 }
 fn mk_managed(cx: ext_ctxt, sp: span, e: @ast::expr) -> @ast::expr {
     mk_expr(cx, sp, ast::expr_unary(ast::box(ast::m_imm), e))
 }
+fn mk_pat_ident(cx: ext_ctxt, span: span, ident: ast::ident) -> @ast::pat {
+    let path = build::mk_raw_path(span, ~[ ident ]);
+    let pat = ast::pat_ident(ast::bind_by_value, path, None);
+    @{ id: cx.next_id(), node: move pat, span: span }
+}
+fn mk_bool(cx: ext_ctxt, span: span, value: bool) -> @ast::expr {
+    let lit_expr = ast::expr_lit(@{ node: ast::lit_bool(value), span: span });
+    build::mk_expr(cx, span, move lit_expr)
+}
+