From: Robert Griesemer <gri@golang.org>
Date: Fri, 19 Jun 2009 00:04:39 +0000 (-0700)
Subject: `` strings may span multiple lines
X-Git-Tag: weekly.2009-11-06~1372
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5eb5d4d3c04345a30408bcf9f10f72c9fd7bcb15;p=gostls13.git

`` strings may span multiple lines

R=rsc
DELTA=3  (2 added, 0 deleted, 1 changed)
OCL=30511
CL=30513
---

diff --git a/src/pkg/go/scanner/scanner.go b/src/pkg/go/scanner/scanner.go
index a90e6f2592..83497790eb 100644
--- a/src/pkg/go/scanner/scanner.go
+++ b/src/pkg/go/scanner/scanner.go
@@ -331,7 +331,7 @@ func (S *Scanner) scanRawString(pos token.Position) {
 	for S.ch != '`' {
 		ch := S.ch;
 		S.next();
-		if ch == '\n' || ch < 0 {
+		if ch < 0 {
 			S.error(pos, "string not terminated");
 			break;
 		}
diff --git a/src/pkg/go/scanner/scanner_test.go b/src/pkg/go/scanner/scanner_test.go
index 0defece8b0..0906d5c0e8 100644
--- a/src/pkg/go/scanner/scanner_test.go
+++ b/src/pkg/go/scanner/scanner_test.go
@@ -63,6 +63,8 @@ var tokens = [...]elt{
 	elt{ token.CHAR, "'\\uff16'", literal },
 	elt{ token.CHAR, "'\\U0000ff16'", literal },
 	elt{ token.STRING, "`foobar`", literal },
+	elt{ token.STRING, "`" `foo
+	                        bar` "`", literal },
 
 	// Operators and delimitors
 	elt{ token.ADD, "+", operator },