diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Parse/Parser.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/Sema.h | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 12 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index a26c310c20..135faf4e9c 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -505,7 +505,9 @@ Parser::ParseDeclarationOrFunctionDefinition( } else if (DeclaratorInfo.isFunctionDeclarator() && (Tok.is(tok::l_brace) || // int X() {} (!getLang().CPlusPlus && - isDeclarationSpecifier()))) { // int X(f) int f; {} + isDeclarationSpecifier()) || // int X(f) int f; {} + (getLang().CPlusPlus && + Tok.is(tok::colon)))) { // X() : Base() {} (used for ctors) if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) { Diag(Tok, diag::err_function_declared_typedef); diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 6b9012b487..42b0205bac 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1588,6 +1588,10 @@ public: void AddImplicitlyDeclaredMembersToClass(CXXRecordDecl *ClassDecl); + virtual void ActOnMemInitializers(DeclTy *ConstructorDecl, + SourceLocation ColonLoc, + MemInitTy **MemInits, unsigned NumMemInits); + virtual void ActOnFinishCXXMemberSpecification(Scope* S, SourceLocation RLoc, DeclTy *TagDecl, SourceLocation LBrac, diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index a85d62bc41..d734ffe5cf 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -706,6 +706,18 @@ Sema::ActOnMemInitializer(DeclTy *ConstructorD, return new CXXBaseOrMemberInitializer(BaseType, (Expr **)Args, NumArgs); } +void Sema::ActOnMemInitializers(DeclTy *ConstructorDecl, + SourceLocation ColonLoc, + MemInitTy **MemInits, unsigned NumMemInits) { + CXXConstructorDecl *Constructor = + dyn_cast<CXXConstructorDecl>((Decl *)ConstructorDecl); + + if (!Constructor) { + Diag(ColonLoc, diag::err_only_constructors_take_base_inits); + return; + } +} + namespace { /// PureVirtualMethodCollector - traverses a class and its superclasses /// and determines if it has any pure virtual methods. |