From 7c906cd06d518a3fc43502440c8984e6ddf64e0f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Mar 2011 13:50:10 +0100
Subject: [PATCH] fix pretty-printer

A change in 54587bdccb7b6771cfc704a30fc0ef2c65824a15 (the vec
appending overhaul) had broken it. (Apparently modifying a vec while
iterating over it can corrupt memory.)
---
 src/comp/pretty/pp.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/comp/pretty/pp.rs b/src/comp/pretty/pp.rs
index 0c355001e95fa..69eb01bcf8338 100644
--- a/src/comp/pretty/pp.rs
+++ b/src/comp/pretty/pp.rs
@@ -99,8 +99,10 @@ impure fn buffer_token(ps p, token tok) {
 }
 
 impure fn finish_block_scan(ps p, contexttype tp) {
+  auto buf = p.buffered;
+  auto front = _vec.shift[token](buf);
   auto indent;
-  alt (p.buffered.(0)){
+  alt (front){
     case (open(box_hv,?ind)) {
       indent = ind;
     }
@@ -109,25 +111,27 @@ impure fn finish_block_scan(ps p, contexttype tp) {
     }
   }
   p.scandepth = 0u;
+  p.buffered = vec();
   push_context(p, tp, indent);
-  _vec.shift[token](p.buffered);
-  for (token t in p.buffered) { add_token(p, t); }
+  for (token t in buf) { add_token(p, t); }
 }
 
 impure fn finish_break_scan(ps p) {
+  auto buf = p.buffered;
+  auto front = _vec.shift[token](buf);
   if (p.bufferedcol > p.width) {
     line_break(p);
   }
   else {
     auto width;
-    alt (p.buffered.(0)) {case(brk(?w)) {width = w;}}
+    alt (front) {case(brk(?w)) {width = w;}}
     auto i = 0u;
     while (i < width) {p.out.write_str(" "); i+=1u;}
     p.col += width;
   }
   p.scandepth = 0u;
-  _vec.shift[token](p.buffered);
-  for (token t in p.buffered) { add_token(p, t); }
+  p.buffered = vec();
+  for (token t in buf) { add_token(p, t); }
 }
 
 impure fn start_scan(ps p, token tok) {