Skip to content

Commit

Permalink
gc: implement and test \r in raw strings
Browse files Browse the repository at this point in the history
For issue 680.

R=ken2
CC=golang-dev
https://golang.org/cl/5492046
  • Loading branch information
rsc committed Dec 15, 2011
1 parent c5fce33 commit 17264df
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/cmd/gc/lex.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,8 @@ _yylex(void)
ncp += ncp;
}
c = getr();
if(c == '\r')
continue;
if(c == EOF) {
yyerror("eof in string");
break;
Expand Down
52 changes: 52 additions & 0 deletions test/crlf.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// $G $D/$F.go && $L $F.$A && ./$A.out >tmp.go &&
// $G tmp.go && $L tmp.$A && ./$A.out
// rm -f tmp.go

// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Test source files and strings containing \r and \r\n.

package main

import (
"fmt"
"strings"
)

func main() {
prog = strings.Replace(prog, "BQ", "`", -1)
prog = strings.Replace(prog, "CR", "\r", -1)
fmt.Print(prog)
}

var prog = `
package main
CR
import "fmt"
var CR s = "hello\n" + CR
" world"CR
var t = BQhelloCR
worldBQ
var u = BQhCReCRlCRlCRoCR
worldBQ
var golden = "hello\n world"
func main() {
if s != golden {
fmt.Printf("s=%q, want %q", s, golden)
}
if t != golden {
fmt.Printf("t=%q, want %q", t, golden)
}
if u != golden {
fmt.Printf("u=%q, want %q", u, golden)
}
}
`

0 comments on commit 17264df

Please sign in to comment.