[cfe-commits] r83186 - in /cfe/trunk: test/Index/c-index-api-test.m tools/CIndex/CIndex.cpp tools/c-index-test/c-index-test.c
Steve Naroff
snaroff at apple.com
Wed Sep 30 17:31:08 PDT 2009
Author: snaroff
Date: Wed Sep 30 19:31:07 2009
New Revision: 83186
URL: http://llvm.org/viewvc/llvm-project?rev=83186&view=rev
Log:
Add support for class and protocol references.
Modified:
cfe/trunk/test/Index/c-index-api-test.m
cfe/trunk/tools/CIndex/CIndex.cpp
cfe/trunk/tools/c-index-test/c-index-test.c
Modified: cfe/trunk/test/Index/c-index-api-test.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/c-index-api-test.m?rev=83186&r1=83185&r2=83186&view=diff
==============================================================================
--- cfe/trunk/test/Index/c-index-api-test.m (original)
+++ cfe/trunk/test/Index/c-index-api-test.m Wed Sep 30 19:31:07 2009
@@ -1,11 +1,20 @@
// RUN: clang -emit-ast %s -o %t.ast &&
// RUN: c-index-test %t.ast all | FileCheck %s
-// CHECK: <invalid loc>:0:0: StructDecl=objc_selector [Context=c-index-api-test.m]
-// CHECK: <invalid loc>:0:0: TypedefDecl=SEL [Context=c-index-api-test.m]
-// CHECK: <invalid loc>:0:0: ObjCInterfaceDecl=Protocol [Context=c-index-api-test.m]
-// CHECK: <invalid loc>:0:0: TypedefDecl=id [Context=c-index-api-test.m]
-// CHECK: <invalid loc>:0:0: TypedefDecl=Class [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=__int128_t:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=__uint128_t:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: StructDecl=objc_selector:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=SEL:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: ObjCInterfaceDecl=Protocol:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=id:0:0 [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=Class:0:0 [Context=c-index-api-test.m]
+// CHECK: <built-in>:80:16: StructDecl=__va_list_tag:80:16 [Context=c-index-api-test.m]
+// CHECK: <built-in>:80:42: FieldDecl=gp_offset:80:42 [Context=__va_list_tag]
+// CHECK: <built-in>:80:63: FieldDecl=fp_offset:80:63 [Context=__va_list_tag]
+// CHECK: <built-in>:80:81: FieldDecl=overflow_arg_area:80:81 [Context=__va_list_tag]
+// CHECK: <built-in>:80:107: FieldDecl=reg_save_area:80:107 [Context=__va_list_tag]
+// CHECK: <built-in>:80:123: TypedefDecl=__va_list_tag:80:123 [Context=c-index-api-test.m]
+// CHECK: <built-in>:80:159: TypedefDecl=__builtin_va_list:80:159 [Context=c-index-api-test.m]
//
@interface Foo
@@ -49,27 +58,27 @@
someEnum
};
-// CHECK: c-index-api-test.m:11:12: ObjCInterfaceDecl=Foo [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:15:1: ObjCInstanceMethodDecl=foo [Context=Foo]
-// CHECK: c-index-api-test.m:16:1: ObjCClassMethodDecl=fooC [Context=Foo]
-// CHECK: c-index-api-test.m:20:12: ObjCInterfaceDecl=Bar [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:20:18: ObjCSuperClassRef=Foo [Context=Bar]
-// CHECK: c-index-api-test.m:26:1: ObjCCategoryDecl=FooCat [Context=c-index-api-test.m]
-// CHECK: <invalid loc>:0:0: ObjCClassRef=Foo [Context=FooCat]
-// CHECK: c-index-api-test.m:27:1: ObjCInstanceMethodDecl=catMethodWithFloat: [Context=FooCat]
-// CHECK: c-index-api-test.m:28:1: ObjCInstanceMethodDecl=floatMethod [Context=FooCat]
-// CHECK: c-index-api-test.m:31:1: ObjCProtocolDecl=Proto [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:32:1: ObjCInstanceMethodDecl=pMethod [Context=Proto]
-// CHECK: c-index-api-test.m:35:1: ObjCProtocolDecl=SubP [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:31:1: ObjCProtocolRef=Proto [Context=SubP]
-// CHECK: c-index-api-test.m:36:1: ObjCInstanceMethodDecl=spMethod [Context=SubP]
-// CHECK: c-index-api-test.m:39:12: ObjCInterfaceDecl=Baz [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:39:18: ObjCSuperClassRef=Bar [Context=Baz]
-// CHECK: c-index-api-test.m:35:1: ObjCProtocolRef=SubP [Context=Baz]
-// CHECK: c-index-api-test.m:41:9: ObjCIvarDecl=_anIVar [Context=Baz]
-// CHECK: c-index-api-test.m:44:1: ObjCInstanceMethodDecl=bazMethod [Context=Baz]
-// CHECK: c-index-api-test.m:48:1: EnumDecl= [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:49:3: EnumConstantDecl=someEnum [Context=]
+// CHECK: c-index-api-test.m:20:12: ObjCInterfaceDecl=Foo:20:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:24:1: ObjCInstanceMethodDecl=foo:24:1 [Context=Foo]
+// CHECK: c-index-api-test.m:25:1: ObjCClassMethodDecl=fooC:25:1 [Context=Foo]
+// CHECK: c-index-api-test.m:29:12: ObjCInterfaceDecl=Bar:29:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:29:18: ObjCSuperClassRef=Foo:29:1 [Context=Bar]
+// CHECK: c-index-api-test.m:35:1: ObjCCategoryDecl=FooCat:35:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:20:1: ObjCClassRef=Foo:35:1 [Context=FooCat]
+// CHECK: c-index-api-test.m:36:1: ObjCInstanceMethodDecl=catMethodWithFloat::36:1 [Context=FooCat]
+// CHECK: c-index-api-test.m:37:1: ObjCInstanceMethodDecl=floatMethod:37:1 [Context=FooCat]
+// CHECK: c-index-api-test.m:40:1: ObjCProtocolDecl=Proto:40:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:41:1: ObjCInstanceMethodDecl=pMethod:41:1 [Context=Proto]
+// CHECK: c-index-api-test.m:44:1: ObjCProtocolDecl=SubP:44:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:40:1: ObjCProtocolRef=Proto:40:1 [Context=SubP]
+// CHECK: c-index-api-test.m:45:1: ObjCInstanceMethodDecl=spMethod:45:1 [Context=SubP]
+// CHECK: c-index-api-test.m:48:12: ObjCInterfaceDecl=Baz:48:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:48:18: ObjCSuperClassRef=Bar:48:1 [Context=Baz]
+// CHECK: c-index-api-test.m:44:1: ObjCProtocolRef=SubP:44:1 [Context=Baz]
+// CHECK: c-index-api-test.m:50:9: ObjCIvarDecl=_anIVar:50:9 [Context=Baz]
+// CHECK: c-index-api-test.m:53:1: ObjCInstanceMethodDecl=bazMethod:53:1 [Context=Baz]
+// CHECK: c-index-api-test.m:57:1: EnumDecl=:57:1 [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:58:3: EnumConstantDecl=someEnum:58:3 [Context=]
int main (int argc, const char * argv[]) {
Baz * bee;
@@ -82,111 +91,134 @@
main(someEnum, (const char **)bee);
}
-// CHECK: c-index-api-test.m:74:5: FunctionDefn=main [Context=c-index-api-test.m]
-// CHECK: c-index-api-test.m:74:15: ParmDecl=argc [Context=main]
-// CHECK: c-index-api-test.m:74:34: ParmDecl=argv [Context=main]
-// CHECK: c-index-api-test.m:75:8: VarDecl=bee [Context=main]
-// CHECK: c-index-api-test.m:76:5: VarDecl=a [Context=main]
-// CHECK: c-index-api-test.m:77:12: VarDecl=c [Context=main]
-// CHECK: c-index-api-test.m:78:13: VarDecl=d [Context=main]
-// CHECK: c-index-api-test.m:75:8: VarDecl=bee [Context:bee]
-// CHECK: c-index-api-test.m:75:9: VarDecl=bee [Context:bee]
-// CHECK: c-index-api-test.m:75:10: VarDecl=bee [Context:bee]
-// CHECK: c-index-api-test.m:76:5: VarDecl=a [Context:a]
-// CHECK: c-index-api-test.m:76:6: VarDecl=a [Context:a]
-// CHECK: c-index-api-test.m:76:7: VarDecl=a [Context:a]
-// CHECK: c-index-api-test.m:76:8: VarDecl=a [Context:a]
-// CHECK: c-index-api-test.m:76:9: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:76:10: VarRef=bee:75:8 [Context:a]
-// CHECK: c-index-api-test.m:76:11: VarRef=bee:75:8 [Context:a]
-// CHECK: c-index-api-test.m:76:12: VarRef=bee:75:8 [Context:a]
-// CHECK: c-index-api-test.m:76:13: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:76:14: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:76:15: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:76:16: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:76:17: ObjCSelectorRef=foo:15:1 [Context:a]
-// CHECK: c-index-api-test.m:77:12: VarDecl=c [Context:c]
-// CHECK: c-index-api-test.m:77:13: VarDecl=c [Context:c]
-// CHECK: c-index-api-test.m:77:14: VarDecl=c [Context:c]
-// CHECK: c-index-api-test.m:77:15: VarDecl=c [Context:c]
-// CHECK: c-index-api-test.m:77:16: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:17: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:18: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:19: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:20: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:21: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:22: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:23: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:24: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:77:25: ObjCSelectorRef=fooC:16:1 [Context:c]
-// CHECK: c-index-api-test.m:78:13: VarDecl=d [Context:d]
-// CHECK: c-index-api-test.m:79:2: VarRef=d:78:13 [Context:main]
-// CHECK: c-index-api-test.m:79:6: VarRef=c:77:12 [Context:main]
-// CHECK: c-index-api-test.m:80:2: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:3: VarRef=d:78:13 [Context:main]
-// CHECK: c-index-api-test.m:80:4: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:5: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:6: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:7: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:8: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:9: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:10: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:11: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:80:12: ObjCSelectorRef=pMethod:32:1 [Context:main]
-// CHECK: c-index-api-test.m:81:2: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:3: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:4: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:5: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:6: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:7: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:8: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:9: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:10: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:11: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:12: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:13: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:14: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:15: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:16: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:17: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:18: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:19: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:20: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:21: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:22: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:23: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:24: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:25: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:81:26: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:27: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:28: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:29: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:81:30: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:31: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:32: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:33: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:34: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:35: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:36: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:37: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:38: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:39: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:40: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:41: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:42: ObjCSelectorRef=floatMethod:28:1 [Context:main]
-// CHECK: c-index-api-test.m:81:43: ObjCSelectorRef=catMethodWithFloat::27:1 [Context:main]
-// CHECK: c-index-api-test.m:82:3: FunctionRef=main:74:5 [Context:main]
-// CHECK: c-index-api-test.m:82:4: FunctionRef=main:74:5 [Context:main]
-// CHECK: c-index-api-test.m:82:5: FunctionRef=main:74:5 [Context:main]
-// CHECK: c-index-api-test.m:82:6: FunctionRef=main:74:5 [Context:main]
-// CHECK: c-index-api-test.m:82:8: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:9: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:10: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:11: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:12: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:13: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:14: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:15: EnumConstantRef=someEnum:49:3 [Context:main]
-// CHECK: c-index-api-test.m:82:33: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:82:34: VarRef=bee:75:8 [Context:main]
-// CHECK: c-index-api-test.m:82:35: VarRef=bee:75:8 [Context:main]
+// CHECK: c-index-api-test.m:83:5: FunctionDefn=main [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:83:15: ParmDecl=argc:83:15 [Context=main]
+// CHECK: c-index-api-test.m:83:34: ParmDecl=argv:83:34 [Context=main]
+// CHECK: c-index-api-test.m:84:8: VarDecl=bee:84:8 [Context=main]
+// CHECK: c-index-api-test.m:85:5: VarDecl=a:85:5 [Context=main]
+// CHECK: c-index-api-test.m:86:12: VarDecl=c:86:12 [Context=main]
+// CHECK: c-index-api-test.m:87:13: VarDecl=d:87:13 [Context=main]
+// CHECK: c-index-api-test.m:84:2: ObjCClassRef=Baz:84:8 [Context:Baz]
+// CHECK: c-index-api-test.m:84:3: ObjCClassRef=Baz:84:8 [Context:Baz]
+// CHECK: c-index-api-test.m:84:4: ObjCClassRef=Baz:84:8 [Context:Baz]
+// CHECK: c-index-api-test.m:84:6: VarDecl=bee:84:8 [Context:bee]
+// CHECK: c-index-api-test.m:84:8: VarDecl=bee:84:8 [Context:bee]
+// CHECK: c-index-api-test.m:84:9: VarDecl=bee:84:8 [Context:bee]
+// CHECK: c-index-api-test.m:84:10: VarDecl=bee:84:8 [Context:bee]
+// CHECK: <invalid loc>:85:2: TypedefDecl=id:0:0 [Context:id]
+// CHECK: <invalid loc>:85:3: TypedefDecl=id:0:0 [Context:id]
+// CHECK: c-index-api-test.m:85:5: VarDecl=a:85:5 [Context:a]
+// CHECK: c-index-api-test.m:85:6: VarDecl=a:85:5 [Context:a]
+// CHECK: c-index-api-test.m:85:7: VarDecl=a:85:5 [Context:a]
+// CHECK: c-index-api-test.m:85:8: VarDecl=a:85:5 [Context:a]
+// CHECK: c-index-api-test.m:85:9: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: c-index-api-test.m:85:10: VarRef=bee:84:8 [Context:a]
+// CHECK: c-index-api-test.m:85:11: VarRef=bee:84:8 [Context:a]
+// CHECK: c-index-api-test.m:85:12: VarRef=bee:84:8 [Context:a]
+// CHECK: c-index-api-test.m:85:13: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: c-index-api-test.m:85:14: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: c-index-api-test.m:85:15: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: c-index-api-test.m:85:16: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: c-index-api-test.m:85:17: ObjCSelectorRef=foo:24:1 [Context:a]
+// CHECK: <invalid loc>:86:2: TypedefDecl=id:0:0 [Context:id]
+// CHECK: <invalid loc>:86:3: TypedefDecl=id:0:0 [Context:id]
+// CHECK: c-index-api-test.m:86:5: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:6: ObjCProtocolRef=SubP [Context:SubP]
+// CHECK: c-index-api-test.m:86:7: ObjCProtocolRef=SubP [Context:SubP]
+// CHECK: c-index-api-test.m:86:8: ObjCProtocolRef=SubP [Context:SubP]
+// CHECK: c-index-api-test.m:86:9: ObjCProtocolRef=SubP [Context:SubP]
+// CHECK: c-index-api-test.m:86:10: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:12: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:13: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:14: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:15: VarDecl=c:86:12 [Context:c]
+// CHECK: c-index-api-test.m:86:16: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:17: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:18: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:19: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:20: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:21: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:22: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:23: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:24: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: c-index-api-test.m:86:25: ObjCSelectorRef=fooC:25:1 [Context:c]
+// CHECK: <invalid loc>:87:2: TypedefDecl=id:0:0 [Context:id]
+// CHECK: <invalid loc>:87:3: TypedefDecl=id:0:0 [Context:id]
+// CHECK: c-index-api-test.m:87:5: VarDecl=d:87:13 [Context:d]
+// CHECK: c-index-api-test.m:87:6: ObjCProtocolRef=Proto [Context:Proto]
+// CHECK: c-index-api-test.m:87:7: ObjCProtocolRef=Proto [Context:Proto]
+// CHECK: c-index-api-test.m:87:8: ObjCProtocolRef=Proto [Context:Proto]
+// CHECK: c-index-api-test.m:87:9: ObjCProtocolRef=Proto [Context:Proto]
+// CHECK: c-index-api-test.m:87:10: ObjCProtocolRef=Proto [Context:Proto]
+// CHECK: c-index-api-test.m:87:11: VarDecl=d:87:13 [Context:d]
+// CHECK: c-index-api-test.m:87:13: VarDecl=d:87:13 [Context:d]
+// CHECK: c-index-api-test.m:88:2: VarRef=d:87:13 [Context:main]
+// CHECK: c-index-api-test.m:88:6: VarRef=c:86:12 [Context:main]
+// CHECK: c-index-api-test.m:89:2: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:3: VarRef=d:87:13 [Context:main]
+// CHECK: c-index-api-test.m:89:4: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:5: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:6: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:7: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:8: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:9: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:10: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:11: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:89:12: ObjCSelectorRef=pMethod:41:1 [Context:main]
+// CHECK: c-index-api-test.m:90:2: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:3: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:4: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:5: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:6: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:7: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:8: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:9: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:10: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:11: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:12: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:13: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:14: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:15: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:16: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:17: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:18: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:19: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:20: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:21: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:22: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:23: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:24: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:25: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:90:26: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:27: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:28: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:29: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:90:30: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:31: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:32: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:33: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:34: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:35: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:36: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:37: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:38: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:39: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:40: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:41: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:42: ObjCSelectorRef=floatMethod:37:1 [Context:main]
+// CHECK: c-index-api-test.m:90:43: ObjCSelectorRef=catMethodWithFloat::36:1 [Context:main]
+// CHECK: c-index-api-test.m:91:3: FunctionRef=main:83:5 [Context:main]
+// CHECK: c-index-api-test.m:91:4: FunctionRef=main:83:5 [Context:main]
+// CHECK: c-index-api-test.m:91:5: FunctionRef=main:83:5 [Context:main]
+// CHECK: c-index-api-test.m:91:6: FunctionRef=main:83:5 [Context:main]
+// CHECK: c-index-api-test.m:91:8: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:9: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:10: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:11: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:12: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:13: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:14: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:15: EnumConstantRef=someEnum:58:3 [Context:main]
+// CHECK: c-index-api-test.m:91:33: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:91:34: VarRef=bee:84:8 [Context:main]
+// CHECK: c-index-api-test.m:91:35: VarRef=bee:84:8 [Context:main]
Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=83186&r1=83185&r2=83186&view=diff
==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Wed Sep 30 19:31:07 2009
@@ -393,6 +393,9 @@
}
case CXCursor_ObjCClassRef:
{
+ if (ObjCInterfaceDecl *OID = dyn_cast<ObjCInterfaceDecl>(ND)) {
+ return OID->getIdentifier()->getName();
+ }
ObjCCategoryDecl *OID = dyn_cast<ObjCCategoryDecl>(ND);
assert(OID && "clang_getCursorLine(): Missing category decl");
return OID->getClassInterface()->getIdentifier()->getName();
@@ -524,10 +527,20 @@
} else if (ObjCMessageExpr *MExp = dyn_cast<ObjCMessageExpr>(Stm)) {
CXCursor C = { CXCursor_ObjCSelectorRef, Dcl, MExp };
return C;
- }
+ }
// Fall through...treat as a decl, not a ref.
}
- CXCursor C = { TranslateKind(Dcl), Dcl, 0 };
+ if (ALoc.isNamedRef()) {
+ if (isa<ObjCInterfaceDecl>(Dcl)) {
+ CXCursor C = { CXCursor_ObjCClassRef, Dcl, ALoc.getParentDecl() };
+ return C;
+ }
+ if (isa<ObjCProtocolDecl>(Dcl)) {
+ CXCursor C = { CXCursor_ObjCProtocolRef, Dcl, ALoc.getParentDecl() };
+ return C;
+ }
+ }
+ CXCursor C = { TranslateKind(Dcl), Dcl, 0 };
return C;
}
CXCursor C = { CXCursor_NoDeclFound, 0, 0 };
@@ -592,19 +605,34 @@
return C.decl;
if (clang_isReference(C.kind)) {
- if (C.stmt)
- return getDeclFromExpr(static_cast<Stmt *>(C.stmt));
- else
+ if (C.stmt) {
+ if (C.kind == CXCursor_ObjCClassRef)
+ return static_cast<Stmt *>(C.stmt);
+ else
+ return getDeclFromExpr(static_cast<Stmt *>(C.stmt));
+ } else
return C.decl;
}
return 0;
}
+
static SourceLocation getLocationFromCursor(CXCursor C,
SourceManager &SourceMgr,
NamedDecl *ND) {
if (clang_isReference(C.kind)) {
switch (C.kind) {
+ case CXCursor_ObjCClassRef:
+ {
+ if (isa<ObjCInterfaceDecl>(ND)) {
+ // FIXME: This is a hack (storing the parent decl in the stmt slot).
+ NamedDecl *parentDecl = static_cast<NamedDecl *>(C.stmt);
+ return parentDecl->getLocation();
+ }
+ ObjCCategoryDecl *OID = dyn_cast<ObjCCategoryDecl>(ND);
+ assert(OID && "clang_getCursorLine(): Missing category decl");
+ return OID->getClassInterface()->getLocation();
+ }
case CXCursor_ObjCSuperClassRef:
{
ObjCInterfaceDecl *OID = dyn_cast<ObjCInterfaceDecl>(ND);
Modified: cfe/trunk/tools/c-index-test/c-index-test.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=83186&r1=83185&r2=83186&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/c-index-test.c (original)
+++ cfe/trunk/tools/c-index-test/c-index-test.c Wed Sep 30 19:31:07 2009
@@ -12,12 +12,10 @@
else {
printf("%s=%s", clang_getCursorKindSpelling(Cursor.kind),
clang_getCursorSpelling(Cursor));
- if (Cursor.stmt) {
- CXDecl DeclReferenced = clang_getCursorDecl(Cursor);
- if (DeclReferenced)
- printf(":%d:%d", clang_getDeclLine(DeclReferenced),
- clang_getDeclColumn(DeclReferenced));
- }
+ CXDecl DeclReferenced = clang_getCursorDecl(Cursor);
+ if (DeclReferenced)
+ printf(":%d:%d", clang_getDeclLine(DeclReferenced),
+ clang_getDeclColumn(DeclReferenced));
}
}
More information about the cfe-commits
mailing list