feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Process the postfix declarators.

Browse Source
This commit is contained in:
Roberto Raggi
2010-08-12 17:23:40 +02:00
parent 73f1cdf3a7
commit 1610356c1a
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/shared/cplusplus/Bind.cpp
View File

@@ -681,17 +681,26 @@ bool Bind::visit(ParameterDeclarationClauseAST *ast)
return false; return false;
} }
void Bind::parameterDeclarationClause(ParameterDeclarationClauseAST *ast) void Bind::parameterDeclarationClause(ParameterDeclarationClauseAST *ast, unsigned lparen_token, Function *fun)
{ {
if (! ast) if (! ast)
return; return;
if (debug_todo) if (! fun) {
translationUnit()->warning(ast->firstToken(), "TODO: %s", __func__); translationUnit()->warning(lparen_token, "undefined function");
return;
}
Scope *previousScope = switchScope(fun);
for (DeclarationListAST *it = ast->parameter_declaration_list; it; it = it->next) { for (DeclarationListAST *it = ast->parameter_declaration_list; it; it = it->next) {
this->declaration(it->value); this->declaration(it->value);
} }
// unsigned dot_dot_dot_token = ast->dot_dot_dot_token;
if (ast->dot_dot_dot_token)
fun->setVariadic(true);
(void) switchScope(previousScope);
} }
bool Bind::visit(TranslationUnitAST *ast) bool Bind::visit(TranslationUnitAST *ast)
@@ -950,9 +959,12 @@ void Bind::lambdaDeclarator(LambdaDeclaratorAST *ast)
if (debug_todo) if (debug_todo)
translationUnit()->warning(ast->firstToken(), "TODO: %s", __func__); translationUnit()->warning(ast->firstToken(), "TODO: %s", __func__);
Function *fun = 0; // ### implement me
// unsigned lparen_token = ast->lparen_token; // unsigned lparen_token = ast->lparen_token;
FullySpecifiedType type; FullySpecifiedType type;
this->parameterDeclarationClause(ast->parameter_declaration_clause); this->parameterDeclarationClause(ast->parameter_declaration_clause, ast->lparen_token, fun);
// unsigned rparen_token = ast->rparen_token; // unsigned rparen_token = ast->rparen_token;
for (SpecifierListAST *it = ast->attributes; it; it = it->next) { for (SpecifierListAST *it = ast->attributes; it; it = it->next) {
type = this->specifier(it->value, type); type = this->specifier(it->value, type);
@@ -2321,29 +2333,37 @@ bool Bind::visit(NestedDeclaratorAST *ast)
// PostfixDeclaratorAST // PostfixDeclaratorAST
bool Bind::visit(FunctionDeclaratorAST *ast) bool Bind::visit(FunctionDeclaratorAST *ast)
{ {
if (debug_todo) Function *fun = control()->newFunction(0, 0);
translationUnit()->warning(ast->firstToken(), "TODO: %s", __func__); fun->setReturnType(_type);
// unsigned lparen_token = ast->lparen_token; // unsigned lparen_token = ast->lparen_token;
this->parameterDeclarationClause(ast->parameters); this->parameterDeclarationClause(ast->parameters, ast->lparen_token, fun);
// unsigned rparen_token = ast->rparen_token; // unsigned rparen_token = ast->rparen_token;
FullySpecifiedType type; FullySpecifiedType type(fun);
for (SpecifierListAST *it = ast->cv_qualifier_list; it; it = it->next) { for (SpecifierListAST *it = ast->cv_qualifier_list; it; it = it->next) {
type = this->specifier(it->value, type); type = this->specifier(it->value, type);
} }
// propagate the cv-qualifiers
fun->setConst(type.isConst());
fun->setVolatile(type.isVolatile());
this->exceptionSpecification(ast->exception_specification, type); this->exceptionSpecification(ast->exception_specification, type);
this->trailingReturnType(ast->trailing_return_type, type); this->trailingReturnType(ast->trailing_return_type, type);
ExpressionTy as_cpp_initializer = this->expression(ast->as_cpp_initializer); if (ast->as_cpp_initializer != 0) {
// Function *symbol = ast->symbol; fun->setAmbiguous(true);
ExpressionTy as_cpp_initializer = this->expression(ast->as_cpp_initializer);
}
ast->symbol = fun;
_type = type;
return false; return false;
} }
bool Bind::visit(ArrayDeclaratorAST *ast) bool Bind::visit(ArrayDeclaratorAST *ast)
{ {
if (debug_todo)
translationUnit()->warning(ast->firstToken(), "TODO: %s", __func__);
// unsigned lbracket_token = ast->lbracket_token;
ExpressionTy expression = this->expression(ast->expression); ExpressionTy expression = this->expression(ast->expression);
// unsigned rbracket_token = ast->rbracket_token; FullySpecifiedType type(control()->arrayType(_type));
_type = type;
return false; return false;
} }

2
src/shared/cplusplus/Bind.h
View File

@@ -94,7 +94,7 @@ protected:
void newInitializer(NewInitializerAST *ast); void newInitializer(NewInitializerAST *ast);
FullySpecifiedType newTypeId(NewTypeIdAST *ast); FullySpecifiedType newTypeId(NewTypeIdAST *ast);
int cppOperator(OperatorAST *ast); int cppOperator(OperatorAST *ast);
void parameterDeclarationClause(ParameterDeclarationClauseAST *ast); void parameterDeclarationClause(ParameterDeclarationClauseAST *ast, unsigned lparen_token, Function *fun);
void translationUnit(TranslationUnitAST *ast); void translationUnit(TranslationUnitAST *ast);
void objCProtocolRefs(ObjCProtocolRefsAST *ast); void objCProtocolRefs(ObjCProtocolRefsAST *ast);
void objCMessageArgument(ObjCMessageArgumentAST *ast); void objCMessageArgument(ObjCMessageArgumentAST *ast);