diff options
author | Alexander Kornienko <alexfh@google.com> | 2012-09-25 17:18:14 +0000 |
---|---|---|
committer | Alexander Kornienko <alexfh@google.com> | 2012-09-25 17:18:14 +0000 |
commit | 4d7e0ced7f16a04aabe2d8d91cbbb52fb1162810 (patch) | |
tree | c6aa5f04eb7a64fb940e2be0a6eeb6afff3465d5 /test/CodeCompletion | |
parent | 317d8f339c2ee7b59e0e8cc81646ef664e20532d (diff) |
Macro history (de-)serialization. Deserialization currently reads only the latest macro definition. Needs more work.
Summary: Passes all tests (+ the new one with code completion), but needs a thorough review in part related to modules.
Reviewers: doug.gregor
Reviewed By: alexfh
CC: cfe-commits, rsmith
Differential Revision: http://llvm-reviews.chandlerc.com/D41
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CodeCompletion')
-rw-r--r-- | test/CodeCompletion/Inputs/macros.h | 7 | ||||
-rw-r--r-- | test/CodeCompletion/macros.c | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/test/CodeCompletion/Inputs/macros.h b/test/CodeCompletion/Inputs/macros.h index 98b5ac6510..5f15dfc2be 100644 --- a/test/CodeCompletion/Inputs/macros.h +++ b/test/CodeCompletion/Inputs/macros.h @@ -2,3 +2,10 @@ #define BAR(X, Y) X, Y #define IDENTITY(X) X #define WIBBLE(...) +#define DEAD_MACRO +#undef DEAD_MACRO +#define MACRO_WITH_HISTORY a +#undef MACRO_WITH_HISTORY +#define MACRO_WITH_HISTORY b, c +#undef MACRO_WITH_HISTORY +#define MACRO_WITH_HISTORY(X, Y) X->Y diff --git a/test/CodeCompletion/macros.c b/test/CodeCompletion/macros.c index 0758bbf768..28f69b2e1b 100644 --- a/test/CodeCompletion/macros.c +++ b/test/CodeCompletion/macros.c @@ -13,11 +13,15 @@ void test(struct Point *p) { // RUN: %clang_cc1 -include %S/Inputs/macros.h -fsyntax-only -code-completion-macros -code-completion-at=%s:14:9 %s -o - | FileCheck -check-prefix=CC2 %s case } + // RUN: %clang_cc1 -include %S/Inputs/macros.h -fsyntax-only -code-completion-macros -code-completion-at=%s:17:7 %s -o - | FileCheck -check-prefix=CC3 %s +#ifdef Q +#endif // Run the same tests, this time with macros loaded from the PCH file. // RUN: %clang_cc1 -emit-pch -o %t %S/Inputs/macros.h // RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:12:14 %s -o - | FileCheck -check-prefix=CC1 %s // RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:14:9 %s -o - | FileCheck -check-prefix=CC2 %s + // RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:17:7 %s -o - | FileCheck -check-prefix=CC3 %s // CC1: color // CC1: x @@ -29,6 +33,14 @@ void test(struct Point *p) { // CC2: FOO // CC2: Green // CC2: IDENTITY(<#X#>) + // CC2: MACRO_WITH_HISTORY(<#X#>, <#Y#>) // CC2: Red // CC2: WIBBLE + + // CC3: BAR + // CC3: DEAD_MACRO + // CC3: FOO + // CC3: IDENTITY + // CC3: MACRO_WITH_HISTORY + // CC3: WIBBLE } |