From: Robert Griesemer <gri@golang.org>
Date: Thu, 26 May 2011 18:54:10 +0000 (-0700)
Subject: fix build: temporarily disable the use of strings.Reader UnreadRune in fmt
X-Git-Tag: weekly.2011-06-02~97
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e8c87a7dddb7a93ebb16a3f4cf0f70b54632da0c;p=gostls13.git

fix build: temporarily disable the use of strings.Reader UnreadRune in fmt

R=r
CC=golang-dev
https://golang.org/cl/4532090
---

diff --git a/src/pkg/fmt/scan.go b/src/pkg/fmt/scan.go
index 42bc52c92b..33ff87182f 100644
--- a/src/pkg/fmt/scan.go
+++ b/src/pkg/fmt/scan.go
@@ -226,6 +226,15 @@ func (s *ss) mustReadRune() (rune int) {
 }
 
 func (s *ss) UnreadRune() os.Error {
+	// Don't use strings.Reader.UnreadRune for now - appears to cause a problem.
+	// TODO(r, gri): Fix this and remove code between --- lines!
+	// ---
+	if _, ok := s.rr.(*strings.Reader); ok {
+		s.peekRune = s.prevRune
+		s.count--
+		return nil
+	}
+	// ---
 	if u, ok := s.rr.(runeUnreader); ok {
 		u.UnreadRune()
 	} else {