diff options
author | Roman Divacky <rdivacky@FreeBSD.org> | 2010-07-13 17:21:42 +0000 |
---|---|---|
committer | Roman Divacky <rdivacky@FreeBSD.org> | 2010-07-13 17:21:42 +0000 |
commit | 4ba675006b5a8edfc48b6a9bd3dcf54a70cc08f2 (patch) | |
tree | 48b44512b5db8ced345df4a1a56b5065cf2a14d9 /test/Lexer | |
parent | d7279c4c177bca357ef96ff1379fd9bc420bfe83 (diff) | |
download | src-4ba675006b5a8edfc48b6a9bd3dcf54a70cc08f2.tar.gz src-4ba675006b5a8edfc48b6a9bd3dcf54a70cc08f2.zip |
Update clang to r108243.vendor/clang/clang-r108243
Notes
Notes:
svn path=/vendor/clang/dist/; revision=210008
svn path=/vendor/clang/clang-r108243/; revision=210076; tag=vendor/clang/clang-r108243
Diffstat (limited to 'test/Lexer')
-rw-r--r-- | test/Lexer/block_cmt_end.c | 2 | ||||
-rw-r--r-- | test/Lexer/constants.c | 7 | ||||
-rw-r--r-- | test/Lexer/has_feature_cxx0x.cpp | 4 | ||||
-rw-r--r-- | test/Lexer/has_feature_exceptions.cpp | 4 | ||||
-rw-r--r-- | test/Lexer/has_feature_rtti.cpp | 4 | ||||
-rw-r--r-- | test/Lexer/hexfloat.cpp | 5 |
6 files changed, 17 insertions, 9 deletions
diff --git a/test/Lexer/block_cmt_end.c b/test/Lexer/block_cmt_end.c index 72bc836a0ef0..b03fb23f8eeb 100644 --- a/test/Lexer/block_cmt_end.c +++ b/test/Lexer/block_cmt_end.c @@ -17,7 +17,7 @@ next comment ends with normal escaped newline: /* expected-warning {{escaped newline}} expected-warning {{backslash and newline}} *\ / -int bar /* expected-error {{invalid token after top level declarator}} */ +int bar /* expected-error {{expected ';' after top level declarator}} */ /* xyz diff --git a/test/Lexer/constants.c b/test/Lexer/constants.c index b833e7b43f47..2602ec255656 100644 --- a/test/Lexer/constants.c +++ b/test/Lexer/constants.c @@ -24,6 +24,13 @@ t', 'abcd' // expected-warning {{multi-character character constant}} }; +// PR4499 +int m0 = '0'; +int m1 = '\\\''; // expected-warning {{multi-character character constant}} +int m2 = '\\\\'; // expected-warning {{multi-character character constant}} +int m3 = '\\\ +'; + #pragma clang diagnostic ignored "-Wmultichar" diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp index 7ea4c2c1cdcf..650e577ca72c 100644 --- a/test/Lexer/has_feature_cxx0x.cpp +++ b/test/Lexer/has_feature_cxx0x.cpp @@ -1,5 +1,5 @@ -// RUN: %clang -E -std=c++0x %s -o - | FileCheck --check-prefix=CHECK-0X %s -// RUN: %clang -E %s -o - | FileCheck --check-prefix=CHECK-NO-0X %s +// RUN: %clang_cc1 -E -std=c++0x %s -o - | FileCheck --check-prefix=CHECK-0X %s +// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-0X %s #if __has_feature(cxx_lambdas) int lambdas(); diff --git a/test/Lexer/has_feature_exceptions.cpp b/test/Lexer/has_feature_exceptions.cpp index cfd1efbf8464..bb5dc0c13362 100644 --- a/test/Lexer/has_feature_exceptions.cpp +++ b/test/Lexer/has_feature_exceptions.cpp @@ -1,5 +1,5 @@ -// RUN: %clang -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s -// RUN: %clang -E -fno-exceptions %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s +// RUN: %clang_cc1 -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s +// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s #if __has_feature(cxx_exceptions) int foo(); diff --git a/test/Lexer/has_feature_rtti.cpp b/test/Lexer/has_feature_rtti.cpp index 690906c292f2..4bfeead32997 100644 --- a/test/Lexer/has_feature_rtti.cpp +++ b/test/Lexer/has_feature_rtti.cpp @@ -1,5 +1,5 @@ -// RUN: %clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s -// RUN: %clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s +// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-RTTI %s +// RUN: %clang_cc1 -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s #if __has_feature(cxx_rtti) int foo(); diff --git a/test/Lexer/hexfloat.cpp b/test/Lexer/hexfloat.cpp index a3b230e78f16..493b64e62740 100644 --- a/test/Lexer/hexfloat.cpp +++ b/test/Lexer/hexfloat.cpp @@ -1,5 +1,6 @@ -// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify +// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s +// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s +// XFAIL: * #ifndef __GXX_EXPERIMENTAL_CXX0X__ float f = 0x1p+1; // expected-warning {{incompatible with C++0x}} |