"invalid unicode code point" -> "invalid unicode scalar"

We reject surrogates in strings and characters, which are valid code points, but not valid Unicode scalars.

Swift SVN r18467
This commit is contained in:
Joe Groff
2014-05-20 21:21:38 +00:00
parent 46a77283e1
commit b51b1f0cfd
4 changed files with 8 additions and 8 deletions

View File

@@ -429,13 +429,13 @@ var st_u2 = " \u123 " // expected-error {{\u escape sequence expects 4 hex digi
var st_u3 = " \U1234567 " // expected-error {{\U escape sequence expects 8 hex digits to follow it}}
var st_u4 = " \q " // expected-error {{invalid escape sequence in literal}}
var st_u5 = " \UFFFFFFFF " // expected-error {{invalid unicode code point}}
var st_u5 = " \UFFFFFFFF " // expected-error {{invalid unicode scalar}}
var st_u6 = " \uD7FF \uE000 " // Fencepost UTF16 surrogate pairs.
var st_u7 = " \uD800 " // expected-error {{invalid unicode code point}}
var st_u8 = " \uDFFF " // expected-error {{invalid unicode code point}}
var st_u7 = " \uD800 " // expected-error {{invalid unicode scalar}}
var st_u8 = " \uDFFF " // expected-error {{invalid unicode scalar}}
var st_u9 = " \xFF " // expected-error {{invalid hex escape}}
var st_u10 = " \U0010FFFD " // Last valid codepoint, 0xFFFE and 0xFFFF are reserved in each plane
var st_u11 = " \U00110000 " // expected-error {{invalid unicode code point}}
var st_u11 = " \U00110000 " // expected-error {{invalid unicode scalar}}
func stringliterals() {
var ch_a = 'ab // expected-error {{unterminated character literal}}