From: Argyrios Kyrtzidis Date: Mon, 29 Feb 2016 07:55:51 +0000 (+0000) Subject: [index] Use ',' to separate symbol roles when printing. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=340ce98984432509e150baa8f18189a07484523b;p=clang [index] Use ',' to separate symbol roles when printing. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@262205 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Index/IndexSymbol.cpp b/lib/Index/IndexSymbol.cpp index 010ccd42a4..96da7a7989 100644 --- a/lib/Index/IndexSymbol.cpp +++ b/lib/Index/IndexSymbol.cpp @@ -214,7 +214,7 @@ void index::printSymbolRoles(SymbolRoleSet Roles, raw_ostream &OS) { bool VisitedOnce = false; applyForEachSymbolRole(Roles, [&](SymbolRole Role) { if (VisitedOnce) - OS << '/'; + OS << ','; else VisitedOnce = true; switch (Role) { diff --git a/test/Index/Core/index-source.cpp b/test/Index/Core/index-source.cpp index 7544646826..406f70f389 100644 --- a/test/Index/Core/index-source.cpp +++ b/test/Index/Core/index-source.cpp @@ -4,6 +4,6 @@ template class TemplCls { // CHECK: [[@LINE-1]]:7 | c++-class/C++ | TemplCls | c:@ST>1#T@TemplCls | | Def | rel: 0 TemplCls(int x); - // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | | Decl/RelChild | rel: 1 + // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | | Decl,RelChild | rel: 1 // CHECK-NEXT: RelChild | TemplCls | c:@ST>1#T@TemplCls }; diff --git a/test/Index/Core/index-source.m b/test/Index/Core/index-source.m index 0fdae7ae5f..6bff76ed27 100644 --- a/test/Index/Core/index-source.m +++ b/test/Index/Core/index-source.m @@ -3,6 +3,6 @@ @interface Base // CHECK: [[@LINE-1]]:12 | objc-class/ObjC | Base | c:objc(cs)Base | _OBJC_CLASS_$_Base | Decl | rel: 0 -(void)meth; -// CHECK: [[@LINE-1]]:1 | objc-instance-method/ObjC | meth | c:objc(cs)Base(im)meth | -[Base meth] | Decl/Dyn/RelChild | rel: 1 +// CHECK: [[@LINE-1]]:1 | objc-instance-method/ObjC | meth | c:objc(cs)Base(im)meth | -[Base meth] | Decl,Dyn,RelChild | rel: 1 // CHECK-NEXT: RelChild | Base | c:objc(cs)Base @end