---

jbclements · jbclements · commit 8507f7ee8594 · 2013-02-13T15:08:27.000-08:00
yaml --- r: 44426 b: refs/heads/master c: 17d3a55 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 25c4676dfa805e027564116b9c37fee7aeaf1cc4
+refs/heads/master: 17d3a55362eb6a0b900d1d828e90d583897fa3b1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
diff --git a/trunk/src/libsyntax/ext/tt/transcribe.rs b/trunk/src/libsyntax/ext/tt/transcribe.rs
@@ -121,15 +121,15 @@ pure fn lookup_cur_matched_by_matched(r: @mut TtReader,
     vec::foldl(start, r.repeat_idx, red)
 }
 
-fn lookup_cur_matched(r: &TtReader, name: ident) -> @named_match {
+fn lookup_cur_matched(r: @mut TtReader, name: ident) -> @named_match {
     lookup_cur_matched_by_matched(r, r.interpolations.get(&name))
 }
 enum lis {
     lis_unconstrained, lis_constraint(uint, ident), lis_contradiction(~str)
 }
 
-fn lockstep_iter_size(t: token_tree, r: &TtReader) -> lis {
-    fn lis_merge(lhs: lis, rhs: lis, r: &TtReader) -> lis {
+fn lockstep_iter_size(t: token_tree, r: @mut TtReader) -> lis {
+    fn lis_merge(lhs: lis, rhs: lis, r: @mut TtReader) -> lis {
         match lhs {
           lis_unconstrained => rhs,
           lis_contradiction(_) => lhs,

Original file line number	Diff line number	Diff line change
`@@ -121,15 +121,15 @@ pure fn lookup_cur_matched_by_matched(r: @mut TtReader,`
`121`	`121`	`vec::foldl(start, r.repeat_idx, red)`
`122`	`122`	`}`
`123`	`123`
`124`		`-fn lookup_cur_matched(r: &TtReader, name: ident) -> @named_match {`
	`124`	`+fn lookup_cur_matched(r: @mut TtReader, name: ident) -> @named_match {`
`125`	`125`	`lookup_cur_matched_by_matched(r, r.interpolations.get(&name))`
`126`	`126`	`}`
`127`	`127`	`enum lis {`
`128`	`128`	`lis_unconstrained, lis_constraint(uint, ident), lis_contradiction(~str)`
`129`	`129`	`}`
`130`	`130`
`131`		`-fn lockstep_iter_size(t: token_tree, r: &TtReader) -> lis {`
`132`		`- fn lis_merge(lhs: lis, rhs: lis, r: &TtReader) -> lis {`
	`131`	`+fn lockstep_iter_size(t: token_tree, r: @mut TtReader) -> lis {`
	`132`	`+ fn lis_merge(lhs: lis, rhs: lis, r: @mut TtReader) -> lis {`
`133`	`133`	`match lhs {`
`134`	`134`	`lis_unconstrained => rhs,`
`135`	`135`	`lis_contradiction(_) => lhs,`