---

jbclements · jbclements · commit fc80046774a5 · 2013-09-06T13:35:09.000-07:00
yaml --- r: 79242 b: refs/heads/auto c: 1f8e856 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 9071ac60b621020c08bc74cd15c363a7780a2230
+refs/heads/auto: 1f8e8564308917efe94663d3577bfe35948b624a
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libsyntax/ext/expand.rs b/branches/auto/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`