diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-03-01 16:31:39 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-03-01 16:31:39 +0000 |
| commit | bf5fe47b128f16ad601204763442af72fe0c39c0 (patch) | |
| tree | be1e393de32d26d02764708e980a2ec68c3bcc07 /clang/test/Index/annotate-nested-name-specifier.cpp | |
| parent | 62a60c50f4fb78f731d4b9d02ad9905afe588671 (diff) | |
| download | bcm5719-llvm-bf5fe47b128f16ad601204763442af72fe0c39c0.tar.gz bcm5719-llvm-bf5fe47b128f16ad601204763442af72fe0c39c0.zip | |
Reinstate r126737, extending the generation of type-source location
information for qualifier type names throughout the parser to address
several problems.
The commit message from r126737:
Push nested-name-specifier source location information into elaborated
name types, e.g., "enum clang::NestedNameSpecifier::SpecifierKind".
Aside from the normal changes, this also required some tweaks to the
parser. Essentially, when we're looking at a type name (via
getTypeName()) specifically for the purpose of creating an annotation
token, we pass down the flag that asks for full type-source location
information to be stored within the returned type. That way, we retain
source-location information involving nested-name-specifiers rather
than trying to reconstruct that information later, long after it's
been lost in the parser.
With this change, test/Index/recursive-cxx-member-calls.cpp is showing
much improved results again, since that code has lots of
nested-name-specifiers.
llvm-svn: 126748
Diffstat (limited to 'clang/test/Index/annotate-nested-name-specifier.cpp')
| -rw-r--r-- | clang/test/Index/annotate-nested-name-specifier.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/clang/test/Index/annotate-nested-name-specifier.cpp b/clang/test/Index/annotate-nested-name-specifier.cpp index c934839cd2f..beb0e40ac04 100644 --- a/clang/test/Index/annotate-nested-name-specifier.cpp +++ b/clang/test/Index/annotate-nested-name-specifier.cpp @@ -307,4 +307,17 @@ struct X5 { // CHECK: Identifier: "iterator" [100:54 - 100:62] TypedefDecl=iter_type:100:63 (Definition) // CHECK: Identifier: "iter_type" [100:63 - 100:72] TypedefDecl=iter_type:100:63 (Definition) +// CHECK: Keyword: "typedef" [101:3 - 101:10] ClassTemplate=X5:98:8 (Definition) +// CHECK: Keyword: "typename" [101:11 - 101:19] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "outer_alias" [101:20 - 101:31] NamespaceRef=outer_alias:10:11 +// CHECK: Punctuation: "::" [101:31 - 101:33] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "inner" [101:33 - 101:38] NamespaceRef=inner:62:13 +// CHECK: Punctuation: "::" [101:38 - 101:40] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "vector" [101:40 - 101:46] TemplateRef=vector:4:12 +// CHECK: Punctuation: "<" [101:46 - 101:47] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Keyword: "int" [101:47 - 101:50] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Punctuation: ">" [101:50 - 101:51] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Punctuation: "::" [101:51 - 101:53] TypedefDecl=int_ptr_type:101:62 (Definition) +// CHECK: Identifier: "iterator" [101:53 - 101:61] TypeRef=iterator:5:18 +// CHECK: Identifier: "int_ptr_type" [101:62 - 101:74] TypedefDecl=int_ptr_type:101:62 (Definition) |
