From: Rob Pike <r@golang.org>
Date: Tue, 14 Apr 2009 02:27:35 +0000 (-0700)
Subject: \r is white space
X-Git-Tag: weekly.2009-11-06~1847
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a20a50b0b261450a46cff105d923cca78440b817;p=gostls13.git

\r is white space

R=rsc
DELTA=2  (0 added, 0 deleted, 2 changed)
OCL=27397
CL=27400
---

diff --git a/src/lib/template/template.go b/src/lib/template/template.go
index 824b9d626b..a40a8b86ca 100644
--- a/src/lib/template/template.go
+++ b/src/lib/template/template.go
@@ -99,7 +99,7 @@ func (t *template) error(err *os.Error, args ...) {
 }
 
 func white(c uint8) bool {
-	return c == ' ' || c == '\t' || c == '\n'
+	return c == ' ' || c == '\t' || c == '\r' || c == '\n'
 }
 
 func (t *template) execute()
@@ -126,7 +126,7 @@ Loop:
 			*t.linenum++;
 			i++;
 			break Loop;
-		case ' ', '\t':
+		case ' ', '\t', '\r':
 			// white space, do nothing
 		case '{':
 			if brace {