diff options
| author | Andre Vehreschild <vehre@gmx.de> | 2015-04-14 15:58:19 +0200 |
|---|---|---|
| committer | Andre Vehreschild <vehre@gmx.de> | 2015-04-14 15:58:19 +0200 |
| commit | 93165dbdfd0406ae43d6dda7cb358fb8c1fcbad7 (patch) | |
| tree | 69186c5617ba843643a58bafef5b351f811391c6 /gcc/go/gofrontend | |
| parent | b70cd7cb6fd66a6f5dfbfb988861cec47c6e2c7a (diff) | |
| parent | 33a2aaa4b5b40e1d705587d8fb669473263baff3 (diff) | |
| download | gcc-93165dbdfd0406ae43d6dda7cb358fb8c1fcbad7.tar.gz | |
Merge remote-tracking branch 'trunk' of git://gcc.gnu.org/git/gcc into vehre/allvehre/base
Diffstat (limited to 'gcc/go/gofrontend')
| -rw-r--r-- | gcc/go/gofrontend/lex.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/lex.cc b/gcc/go/gofrontend/lex.cc index 3404cedb5f6..aa7071dbe78 100644 --- a/gcc/go/gofrontend/lex.cc +++ b/gcc/go/gofrontend/lex.cc @@ -1440,7 +1440,10 @@ Lex::gather_raw_string() bool issued_error; this->lineoff_ = p - this->linebuf_; p = this->advance_one_utf8_char(p, &c, &issued_error); - Lex::append_char(c, true, &value, loc); + // "Carriage return characters ('\r') inside raw string literals + // are discarded from the raw string value." + if (c != '\r') + Lex::append_char(c, true, &value, loc); } this->lineoff_ = p - this->linebuf_; if (!this->require_line()) |