---

jbclements · jbclements · commit 1616e113484d · 2013-09-06T13:35:09.000-07:00
yaml --- r: 79727 b: refs/heads/try c: 1f8e856 h: refs/heads/master i: 79725: 47a9317 79723: 831ee1b 79719: 168b9b7 79711: a3f9ced v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: ba9fa89bfb4aae53db93e9ecac31807af96356fc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 54ae2800ffb30513f89ce13d27ac3c8d095d98ac
-refs/heads/try: 9071ac60b621020c08bc74cd15c363a7780a2230
+refs/heads/try: 1f8e8564308917efe94663d3577bfe35948b624a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libsyntax/ext/expand.rs b/branches/try/src/libsyntax/ext/expand.rs
@@ -772,7 +772,8 @@ pub fn expand_block(extsbox: @mut SyntaxEnv,
                     orig: @fn(&Block, @ast_fold) -> Block)
                  -> Block {
     // see note below about treatment of exts table
-    with_exts_frame!(extsbox,false,orig(blk,fld))
+    with_exts_frame!(extsbox,false,
+                     expand_block_elts(*extsbox, blk, fld))
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,8 @@ pub fn expand_block(extsbox: @mut SyntaxEnv,`
`772`	`772`	`orig: @fn(&Block, @ast_fold) -> Block)`
`773`	`773`	`-> Block {`
`774`	`774`	`// see note below about treatment of exts table`
`775`		`- with_exts_frame!(extsbox,false,orig(blk,fld))`
	`775`	`+ with_exts_frame!(extsbox,false,`
	`776`	`+ expand_block_elts(*extsbox, blk, fld))`
`776`	`777`	`}`
`777`	`778`
`778`	`779`