maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

add parser and sema support for the funny ObjC '@defs' thing. 

Patch by David Chisnall!

llvm-svn: 52586
This commit is contained in:
Chris Lattner 2008-06-21 19:39:06 +00:00
parent 14b911d929
commit 535b830449
6 changed files with 103 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/DiagnosticKinds.def
View File

@ -331,6 +331,8 @@ DIAG(err_expected_ident_lbrace, ERROR,
"expected identifier or '{'")
DIAG(err_expected_lbrace, ERROR,
"expected '{'")
DIAG(err_expected_lparen, ERROR,
"expected '('")
DIAG(err_expected_rparen, ERROR,
"expected ')'")
DIAG(err_expected_rsquare, ERROR,
@ -922,6 +924,8 @@ DIAG(err_typecheck_call_invalid_ordered_compare, ERROR,
"ordered compare requires two args of floating point type ('%0' and '%1')")
DIAG(err_typecheck_cond_expect_scalar, ERROR,
"used type '%0' where arithmetic or pointer type is required")
DIAG(err_typecheck_invalid_union_cast, ERROR,
"'%0' is not a member of '%1'")
DIAG(ext_typecheck_cond_one_void, EXTENSION,
"C99 forbids conditional expressions with only one void side")
DIAG(ext_typecheck_cast_nonscalar, EXTENSION,

5
clang/include/clang/Parse/Action.h
View File

@ -210,6 +210,11 @@ public:
return 0;
}
/// Act on @defs() element found when parsing a structure. ClassName is the
/// name of the referenced class.
virtual void ActOnDefs(Scope *S, SourceLocation DeclStart,
IdentifierInfo *ClassName,
llvm::SmallVector<DeclTy*, 16> &Decls) {}
virtual DeclTy *ActOnField(Scope *S, SourceLocation DeclStart,
Declarator &D, ExprTy *BitfieldWidth) {
return 0;

47
clang/lib/Parse/ParseDecl.cpp
View File

@ -707,7 +707,7 @@ ParseStructDeclaration(DeclSpec &DS,
/// struct-declaration-list:
/// struct-declaration
/// struct-declaration-list struct-declaration
/// [OBC] '@' 'defs' '(' class-name ')' [TODO]
/// [OBC] '@' 'defs' '(' class-name ')'
///
void Parser::ParseStructUnionBody(SourceLocation RecordLoc,
unsigned TagType, DeclTy *TagDecl) {
@ -736,18 +736,39 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc,
// Parse all the comma separated declarators.
DeclSpec DS;
FieldDeclarators.clear();
ParseStructDeclaration(DS, FieldDeclarators);
// Convert them all to fields.
for (unsigned i = 0, e = FieldDeclarators.size(); i != e; ++i) {
FieldDeclarator &FD = FieldDeclarators[i];
// Install the declarator into the current TagDecl.
DeclTy *Field = Actions.ActOnField(CurScope,
DS.getSourceRange().getBegin(),
FD.D, FD.BitfieldSize);
FieldDecls.push_back(Field);
}
if (!Tok.is(tok::at)) {
ParseStructDeclaration(DS, FieldDeclarators);
// Convert them all to fields.
for (unsigned i = 0, e = FieldDeclarators.size(); i != e; ++i) {
FieldDeclarator &FD = FieldDeclarators[i];
// Install the declarator into the current TagDecl.
DeclTy *Field = Actions.ActOnField(CurScope,
DS.getSourceRange().getBegin(),
FD.D, FD.BitfieldSize);
FieldDecls.push_back(Field);
}
} else { // Handle @defs
ConsumeToken();
if (!Tok.isObjCAtKeyword(tok::objc_defs)) {
Diag(Tok, diag::err_unexpected_at);
SkipUntil(tok::semi, true, true);
continue;
}
ConsumeToken();
ExpectAndConsume(tok::l_paren, diag::err_expected_lparen);
if (!Tok.is(tok::identifier)) {
Diag(Tok, diag::err_expected_ident);
SkipUntil(tok::semi, true, true);
continue;
}
llvm::SmallVector<DeclTy*, 16> Fields;
Actions.ActOnDefs(CurScope, Tok.getLocation(), Tok.getIdentifierInfo(),
Fields);
FieldDecls.insert(FieldDecls.end(), Fields.begin(), Fields.end());
ConsumeToken();
ExpectAndConsume(tok::r_paren, diag::err_expected_rparen);
}
if (Tok.is(tok::semi)) {
ConsumeToken();

2
clang/lib/Sema/Sema.h
View File

@ -240,6 +240,8 @@ private:
virtual DeclTy *ActOnTag(Scope *S, unsigned TagType, TagKind TK,
SourceLocation KWLoc, IdentifierInfo *Name,
SourceLocation NameLoc, AttributeList *Attr);
virtual void ActOnDefs(Scope *S, SourceLocation DeclStart, IdentifierInfo
*ClassName, llvm::SmallVector<DeclTy*, 16> &Decls);
virtual DeclTy *ActOnField(Scope *S, SourceLocation DeclStart,
Declarator &D, ExprTy *BitfieldWidth);

29
clang/lib/Sema/SemaDecl.cpp
View File

@ -1731,6 +1731,35 @@ Sema::DeclTy *Sema::ActOnTag(Scope *S, unsigned TagType, TagKind TK,
return New;
}
/// Collect the instance variables declared in an Objective-C object. Used in
/// the creation of structures from objects using the @defs directive.
static void CollectIvars(ObjCInterfaceDecl *Class,
llvm::SmallVector<Sema::DeclTy*, 16> &ivars) {
if (Class->getSuperClass())
CollectIvars(Class->getSuperClass(), ivars);
ivars.append(Class->ivar_begin(), Class->ivar_end());
}
/// Called whenever @defs(ClassName) is encountered in the source. Inserts the
/// instance variables of ClassName into Decls.
void Sema::ActOnDefs(Scope *S, SourceLocation DeclStart,
IdentifierInfo *ClassName,
llvm::SmallVector<DeclTy*, 16> &Decls) {
// Check that ClassName is a valid class
ObjCInterfaceDecl *Class = getObjCInterfaceDecl(ClassName);
if (!Class) {
Diag(DeclStart, diag::err_undef_interface, ClassName->getName());
return;
}
// Add the isa pointer
Decls.push_back(FieldDecl::Create(Context, SourceLocation(),
&Context.Idents.get("isa"),
Context.getObjCClassType()));
// Collect the instance variables
CollectIvars(Class, Decls);
}
static bool CalcFakeICEVal(const Expr* Expr,
llvm::APSInt& Result,
ASTContext& Context) {

29
clang/test/Sema/objc-at-defs.m Normal file
View File

@ -0,0 +1,29 @@
// RUN: clang %s -fsyntax-only
@interface Test {
double a;
}
@end
@implementation Test
@end
@interface TestObject : Test {
@public
float bar;
int foo;
}
@end
@implementation TestObject
@end
struct wibble {
@defs(TestObject)
};
int main(void)
{
TestObject * a = (id)malloc(100);
a->foo = 12;
printf("12: %d\n", ((struct wibble*)a)->foo);
printf("%d: %d\n", ((char*)&(((struct wibble*)a)->foo)) - (char*)a, ((char*)&(a->foo)) - (char*)a);
return 0;
}