From 5eb5d4d3c04345a30408bcf9f10f72c9fd7bcb15 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Thu, 18 Jun 2009 17:04:39 -0700 Subject: [PATCH] `` strings may span multiple lines R=rsc DELTA=3 (2 added, 0 deleted, 1 changed) OCL=30511 CL=30513 --- src/pkg/go/scanner/scanner.go | 2 +- src/pkg/go/scanner/scanner_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 }, -- 2.48.1