`` 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 a90e6f2592ca1b99392ba46cf5c75988e7884c80..83497790eb4a58e600ff1a626c6d597ce2f243b2 100644 (file)
--- 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 0defece8b0c55026cf37d489bbb96f5d27eae0e7..0906d5c0e802eb8eaee4be6a7f7a0968472661cd 100644 (file)
--- 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 },