From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date: Mon, 29 Feb 2016 07:55:51 +0000 (+0000)
Subject: [index] Use ',' to separate symbol roles when printing.
X-Git-Tag: llvmorg-3.9.0-rc1~12943
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d97ec18fe449a9d36d831bc3f61c747667101f36;p=platform%2Fupstream%2Fllvm.git

[index] Use ',' to separate symbol roles when printing.

llvm-svn: 262205
---

diff --git a/clang/lib/Index/IndexSymbol.cpp b/clang/lib/Index/IndexSymbol.cpp
index 010ccd4..96da7a7 100644
--- a/clang/lib/Index/IndexSymbol.cpp
+++ b/clang/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/clang/test/Index/Core/index-source.cpp b/clang/test/Index/Core/index-source.cpp
index 7544646..406f70f 100644
--- a/clang/test/Index/Core/index-source.cpp
+++ b/clang/test/Index/Core/index-source.cpp
@@ -4,6 +4,6 @@ template <typename TemplArg>
 class TemplCls {
 // CHECK: [[@LINE-1]]:7 | c++-class/C++ | TemplCls | c:@ST>1#T@TemplCls | <no-cgname> | Def | rel: 0
   TemplCls(int x);
-  // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | <no-cgname> | Decl/RelChild | rel: 1
+  // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | <no-cgname> | Decl,RelChild | rel: 1
   // CHECK-NEXT: RelChild | TemplCls | c:@ST>1#T@TemplCls
 };
diff --git a/clang/test/Index/Core/index-source.m b/clang/test/Index/Core/index-source.m
index 0fdae7a..6bff76e 100644
--- a/clang/test/Index/Core/index-source.m
+++ b/clang/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