summaryrefslogtreecommitdiff
path: root/src/pkg/go
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2009-06-18 17:04:39 -0700
committerRobert Griesemer <gri@golang.org>2009-06-18 17:04:39 -0700
commitb819c2c7823706498685869b35d934c27f90992d (patch)
treecb94b87b23b456d116d4422b953b194a11fbe1ed /src/pkg/go
parent864ac661833a84b1d5b3cf1748fcb294ed2bcb50 (diff)
downloadgolang-b819c2c7823706498685869b35d934c27f90992d.tar.gz
`` strings may span multiple lines
R=rsc DELTA=3 (2 added, 0 deleted, 1 changed) OCL=30511 CL=30513
Diffstat (limited to 'src/pkg/go')
-rw-r--r--src/pkg/go/scanner/scanner.go2
-rw-r--r--src/pkg/go/scanner/scanner_test.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/pkg/go/scanner/scanner.go b/src/pkg/go/scanner/scanner.go
index a90e6f259..83497790e 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 0defece8b..0906d5c0e 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 },