aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/CodeCompletion/member-access.cpp18
-rw-r--r--test/CodeCompletion/namespace-alias.cpp4
-rw-r--r--test/CodeCompletion/operator.cpp2
-rw-r--r--test/CodeCompletion/tag.cpp10
-rw-r--r--test/CodeCompletion/using-namespace.cpp4
-rw-r--r--test/CodeCompletion/using.cpp6
6 files changed, 22 insertions, 22 deletions
diff --git a/test/CodeCompletion/member-access.cpp b/test/CodeCompletion/member-access.cpp
index cbd19db1a5..b23436d8c8 100644
--- a/test/CodeCompletion/member-access.cpp
+++ b/test/CodeCompletion/member-access.cpp
@@ -28,15 +28,15 @@ public:
void test(const Proxy &p) {
p->
// RUN: clang-cc -fsyntax-only -code-completion-at=%s:29:6 %s -o - | FileCheck -check-prefix=CC1 %s &&
+ // CHECK-CC1: member1 : 0 : [#Base1::#]member1
+ // CHECK-CC1: member1 : 0 : [#Base2::#]member1
+ // CHECK-CC1: member2 : 0 : [#Base1::#]member2
+ // CHECK-CC1: member3 : 0
// CHECK-CC1: member4 : 0
- // CHECK-CC1: memfun3 : 0
- // CHECK-CC1: memfun1 : 1
- // CHECK-CC1: memfun1 : 1
- // CHECK-CC1: memfun2 : 1
- // CHECK-CC1: member1 : 2
- // CHECK-CC1: member1 : 2
- // CHECK-CC1: member2 : 2
- // CHECK-CC1: member3 : 2
- // CHECK-CC1: memfun1 : 2 (Hidden) : Base2::memfun1(<#int#>)
+ // CHECK-CC1: memfun1 : 0 : [#Base3::#]memfun1(<#float#>)
+ // CHECK-CC1: memfun1 : 0 : [#Base3::#]memfun1(<#double#>)
+ // CHECK-CC1: memfun2 : 0 : [#Base3::#]memfun2(<#int#>)
+ // CHECK-CC1: memfun3 : 0 : memfun3(<#int#>)
+ // CHECK-CC1: memfun1 : 0 (Hidden) : Base2::memfun1(<#int#>)
// RUN: true
diff --git a/test/CodeCompletion/namespace-alias.cpp b/test/CodeCompletion/namespace-alias.cpp
index cae3d561d1..c92e554e5f 100644
--- a/test/CodeCompletion/namespace-alias.cpp
+++ b/test/CodeCompletion/namespace-alias.cpp
@@ -15,7 +15,7 @@ namespace N2 {
// CHECK-CC1: I1 : 1
// CHECK-CC1: I4 : 1
// CHECK-CC1: I5 : 1
- // CHECK-CC1: N2 : 2
- // CHECK-NEXT-CC1: N4 : 2
+ // CHECK-CC1: N2 : 3
+ // CHECK-NEXT-CC1: N4 : 3
// RUN: true
\ No newline at end of file
diff --git a/test/CodeCompletion/operator.cpp b/test/CodeCompletion/operator.cpp
index 72a3f6bb71..a3950f6b89 100644
--- a/test/CodeCompletion/operator.cpp
+++ b/test/CodeCompletion/operator.cpp
@@ -14,5 +14,5 @@ void f() {
// CHECK-CC1: short : 0
// CHECK-CC1: Integer : 2
// CHECK-CC1: T : 2
- // CHECK-CC1: N : 5
+ // CHECK-CC1: N : 6
// RUN: true
diff --git a/test/CodeCompletion/tag.cpp b/test/CodeCompletion/tag.cpp
index 201aec4dd3..2642b7c731 100644
--- a/test/CodeCompletion/tag.cpp
+++ b/test/CodeCompletion/tag.cpp
@@ -18,9 +18,9 @@ namespace N {
// RUN: clang-cc -fsyntax-only -code-completion-at=%s:17:10 %s -o - | FileCheck -check-prefix=CC1 %s &&
// CHECK-CC1: Y : 2
// CHECK-CC1: Z : 2
- // CHECK-CC1: A : 3
- // CHECK-CC1: X : 3
- // CHECK-CC1: Y : 3
- // CHECK-CC1: M : 6
- // CHECK-CC1: N : 6
+ // CHECK-CC1: A : 4
+ // CHECK-CC1: X : 4
+ // CHECK-CC1: Y : 4
+ // CHECK-CC1: M : 9
+ // CHECK-CC1: N : 9
// RUN: true
diff --git a/test/CodeCompletion/using-namespace.cpp b/test/CodeCompletion/using-namespace.cpp
index 95bff9b5ee..3e8cd53723 100644
--- a/test/CodeCompletion/using-namespace.cpp
+++ b/test/CodeCompletion/using-namespace.cpp
@@ -16,6 +16,6 @@ namespace N2 {
// CHECK-CC1: I1 : 2
// CHECK-CC1: I4 : 2
// CHECK-CC1: I5 : 2
- // CHECK-CC1: N2 : 3
- // CHECK-NEXT-CC1: N4 : 3
+ // CHECK-CC1: N2 : 4
+ // CHECK-NEXT-CC1: N4 : 4
// RUN: true
diff --git a/test/CodeCompletion/using.cpp b/test/CodeCompletion/using.cpp
index 27b85fc766..dac556e151 100644
--- a/test/CodeCompletion/using.cpp
+++ b/test/CodeCompletion/using.cpp
@@ -18,8 +18,8 @@ namespace N2 {
// CHECK-CC1: I1 : 2
// CHECK-CC1: I4 : 2
// CHECK-CC1: I5 : 2
- // CHECK-CC1: N2 : 3
- // CHECK-CC1: N3 : 3
- // CHECK-NEXT-CC1: N4 : 3
+ // CHECK-CC1: N2 : 4
+ // CHECK-CC1: N3 : 4
+ // CHECK-NEXT-CC1: N4 : 4
// RUN: true